From 88653c9245444c06747da275d812ec04998a82e9 Mon Sep 17 00:00:00 2001 From: nicholasclark-openai Date: Thu, 19 Mar 2026 11:50:06 -0700 Subject: [PATCH] Simplify RMCP tool call _meta plumbing Co-authored-by: Codex --- codex-rs/rmcp-client/src/rmcp_client.rs | 28 ++----------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/codex-rs/rmcp-client/src/rmcp_client.rs b/codex-rs/rmcp-client/src/rmcp_client.rs index 1896c5c9e3..7a865eefe2 100644 --- a/codex-rs/rmcp-client/src/rmcp_client.rs +++ b/codex-rs/rmcp-client/src/rmcp_client.rs @@ -20,7 +20,6 @@ use reqwest::header::AUTHORIZATION; use reqwest::header::CONTENT_TYPE; use reqwest::header::HeaderMap; use reqwest::header::WWW_AUTHENTICATE; -use rmcp::model::CallToolRequest; use rmcp::model::CallToolRequestParams; use rmcp::model::CallToolResult; use rmcp::model::ClientNotification; @@ -724,7 +723,7 @@ impl RmcpClient { None => None, }; let rmcp_params = CallToolRequestParams { - meta: None, + meta: request_meta, name: name.into(), arguments, task: None, @@ -732,30 +731,7 @@ impl RmcpClient { let result = self .run_service_operation("tools/call", timeout, move |service| { let rmcp_params = rmcp_params.clone(); - let request_meta = request_meta.clone(); - async move { - let result = service - .peer() - .send_request_with_option( - ClientRequest::CallToolRequest(CallToolRequest { - method: Default::default(), - params: rmcp_params, - extensions: Default::default(), - }), - rmcp::service::PeerRequestOptions { - timeout: None, - meta: request_meta, - }, - ) - .await? - .await_response() - .await?; - match result { - ServerResult::CallToolResult(result) => Ok(result), - _ => Err(rmcp::service::ServiceError::UnexpectedResponse), - } - } - .boxed() + async move { service.call_tool(rmcp_params).await }.boxed() }) .await?; self.persist_oauth_tokens().await;