Simplify RMCP tool call _meta plumbing

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
nicholasclark-openai
2026-03-19 11:50:06 -07:00
co-authored by Codex
parent 98f97df37f
commit 88653c9245
+2 -26
View File
@@ -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;