From a5a297fc5d75ed447330fdda0a2d141b6225ff7a Mon Sep 17 00:00:00 2001 From: Alex Hancock Date: Mon, 28 Sep 2026 15:51:29 +0000 Subject: [PATCH] chore(deps): update rmcp to 3.4.1 (#12483) --- Cargo.lock | 30 +++++++++---------- Cargo.toml | 2 +- crates/goose-mcp/src/autovisualiser/mod.rs | 4 +-- .../goose-mcp/src/computercontroller/mod.rs | 4 +-- crates/goose-mcp/src/memory/mod.rs | 4 +-- crates/goose-mcp/src/tutorial/mod.rs | 4 +-- crates/goose-test-support/src/mcp.rs | 4 +-- .../goose/src/agents/extension_manager/mod.rs | 8 ++--- .../extension_manager/streamable_http.rs | 6 ++-- crates/goose/src/agents/mcp_client.rs | 4 +-- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1d68b6135..01f9e6940 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5242,7 +5242,7 @@ dependencies = [ "rcgen", "regex", "reqwest 0.13.5", - "rmcp 3.3.0", + "rmcp 3.4.1", "rubato", "rustls", "schemars 1.2.2", @@ -5314,7 +5314,7 @@ dependencies = [ "async-trait", "futures", "goose-provider-types", - "rmcp 3.3.0", + "rmcp 3.4.1", "schemars 1.2.2", "serde", "serde_json", @@ -5363,7 +5363,7 @@ dependencies = [ "rand 0.10.2", "regex", "reqwest 0.13.5", - "rmcp 3.3.0", + "rmcp 3.4.1", "rustyline", "serde", "serde_json", @@ -5398,7 +5398,7 @@ dependencies = [ "goose-provider-types", "include_dir", "minijinja", - "rmcp 3.3.0", + "rmcp 3.4.1", "serde", "serde_json", "tokio", @@ -5440,7 +5440,7 @@ dependencies = [ "minijinja", "pulldown-cmark", "regex", - "rmcp 3.3.0", + "rmcp 3.4.1", "safemlx", "safemlx-lm", "safemlx-lm-utils", @@ -5466,7 +5466,7 @@ dependencies = [ "lopdf", "once_cell", "process-wrap 9.1.0", - "rmcp 3.3.0", + "rmcp 3.4.1", "schemars 1.2.2", "serde", "serde_json", @@ -5494,7 +5494,7 @@ dependencies = [ "rand 0.10.2", "regex", "reqwest 0.13.5", - "rmcp 3.3.0", + "rmcp 3.4.1", "serde", "serde_json", "strum 0.28.0", @@ -5528,7 +5528,7 @@ dependencies = [ "pem 4.0.0", "pkcs8 0.11.0", "reqwest 0.13.5", - "rmcp 3.3.0", + "rmcp 3.4.1", "sec1 0.8.1", "serde", "serde_json", @@ -5577,7 +5577,7 @@ dependencies = [ "goose-context-management", "goose-providers", "goose-sdk-types", - "rmcp 3.3.0", + "rmcp 3.4.1", "serde_json", "thiserror 2.0.20", "tokio", @@ -5611,7 +5611,7 @@ dependencies = [ "axum", "env-lock", "opentelemetry 0.32.0", - "rmcp 3.3.0", + "rmcp 3.4.1", "serde_json", "tokio", ] @@ -10269,9 +10269,9 @@ dependencies = [ [[package]] name = "rmcp" -version = "3.3.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b88db56b8ae316560e9e868b6b978ea940f27cb883323fc90e07435e44158f5c" +checksum = "5b6317cd8c13e3ec9033cf2aa5aa92cd743f0f4f8a93cddc42ea0ae6ce3b8898" dependencies = [ "async-trait", "base64 0.23.1", @@ -10290,7 +10290,7 @@ dependencies = [ "process-wrap 10.0.0", "rand 0.10.2", "reqwest 0.13.5", - "rmcp-macros 3.3.0", + "rmcp-macros 3.4.1", "schemars 1.2.2", "serde", "serde_json", @@ -10320,9 +10320,9 @@ dependencies = [ [[package]] name = "rmcp-macros" -version = "3.3.0" +version = "3.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "873b730df6f0a9b74b13eb514e0dca4c2db0d8b68b74af98a2e9bf3f9d436585" +checksum = "d2ee366004e5f87c103be91c6c09337811517ae8d2f919ece9da7c21444b85c5" dependencies = [ "darling 0.24.1", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 37d96d7a3..db2d83acb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ uninlined_format_args = "allow" string_slice = "warn" [workspace.dependencies] -rmcp = { version = "3.2.0", default-features = false, features = ["schemars", "auth"] } +rmcp = { version = "3.4.1", default-features = false, features = ["schemars", "auth"] } agent-client-protocol-schema = { version = "=1.9.1", default-features = false } agent-client-protocol = { version = "2.2.0", default-features = false } agent-client-protocol-http = { version = "2.2.0", default-features = false } diff --git a/crates/goose-mcp/src/autovisualiser/mod.rs b/crates/goose-mcp/src/autovisualiser/mod.rs index 35ab0f596..0a99bd978 100644 --- a/crates/goose-mcp/src/autovisualiser/mod.rs +++ b/crates/goose-mcp/src/autovisualiser/mod.rs @@ -6,7 +6,7 @@ use rmcp::{ CallToolResult, ContentBlock, ErrorCode, ErrorData, Implementation, InitializeResult, ListResourcesResult, MetaObject, PaginatedRequestParams, ReadResourceRequestParams, ReadResourceResponse, ReadResourceResult, Resource, ResourceContents, ServerCapabilities, - ServerInfo, + ServerConfig, }, service::RequestContext, tool, tool_handler, tool_router, RoleServer, ServerHandler, @@ -625,7 +625,7 @@ impl Default for AutoVisualiserRouter { #[tool_handler(router = self.tool_router)] impl ServerHandler for AutoVisualiserRouter { - fn get_info(&self) -> ServerInfo { + fn get_info(&self) -> ServerConfig { InitializeResult::new( ServerCapabilities::builder() .enable_tools() diff --git a/crates/goose-mcp/src/computercontroller/mod.rs b/crates/goose-mcp/src/computercontroller/mod.rs index 44d353894..87712e5b5 100644 --- a/crates/goose-mcp/src/computercontroller/mod.rs +++ b/crates/goose-mcp/src/computercontroller/mod.rs @@ -8,7 +8,7 @@ use rmcp::{ handler::server::{router::tool::ToolRouter, wrapper::Parameters}, model::{ CallToolResult, ContentBlock, ErrorCode, ErrorData, Implementation, InitializeResult, - ServerCapabilities, ServerInfo, + ServerCapabilities, ServerConfig, }, schemars::JsonSchema, tool, tool_handler, tool_router, ServerHandler, @@ -877,7 +877,7 @@ impl ComputerControllerServer { #[tool_handler(router = self.tool_router)] impl ServerHandler for ComputerControllerServer { - fn get_info(&self) -> ServerInfo { + fn get_info(&self) -> ServerConfig { InitializeResult::new(ServerCapabilities::builder().enable_tools().build()) .with_server_info(Implementation::new( "goose-computercontroller", diff --git a/crates/goose-mcp/src/memory/mod.rs b/crates/goose-mcp/src/memory/mod.rs index edd20b80f..f0a335a49 100644 --- a/crates/goose-mcp/src/memory/mod.rs +++ b/crates/goose-mcp/src/memory/mod.rs @@ -4,7 +4,7 @@ use rmcp::{ handler::server::{router::tool::ToolRouter, wrapper::Parameters}, model::{ CallToolResult, ContentBlock, ErrorCode, ErrorData, Implementation, InitializeResult, - MetaObject, ServerCapabilities, ServerInfo, + MetaObject, ServerCapabilities, ServerConfig, }, schemars::JsonSchema, service::RequestContext, @@ -509,7 +509,7 @@ impl MemoryServer { #[tool_handler(router = self.tool_router)] impl ServerHandler for MemoryServer { - fn get_info(&self) -> ServerInfo { + fn get_info(&self) -> ServerConfig { InitializeResult::new(ServerCapabilities::builder().enable_tools().build()) .with_server_info(Implementation::new( "goose-memory", diff --git a/crates/goose-mcp/src/tutorial/mod.rs b/crates/goose-mcp/src/tutorial/mod.rs index 33f9ebb16..681893972 100644 --- a/crates/goose-mcp/src/tutorial/mod.rs +++ b/crates/goose-mcp/src/tutorial/mod.rs @@ -4,7 +4,7 @@ use rmcp::{ handler::server::{router::tool::ToolRouter, wrapper::Parameters}, model::{ Annotations, CallToolResult, ContentBlock, ErrorCode, ErrorData, Implementation, - InitializeResult, Role, ServerCapabilities, ServerInfo, TextContent, + InitializeResult, Role, ServerCapabilities, ServerConfig, TextContent, }, schemars::JsonSchema, tool, tool_handler, tool_router, ServerHandler, @@ -109,7 +109,7 @@ impl TutorialServer { #[tool_handler(router = self.tool_router)] impl ServerHandler for TutorialServer { - fn get_info(&self) -> ServerInfo { + fn get_info(&self) -> ServerConfig { InitializeResult::new(ServerCapabilities::builder().enable_tools().build()) .with_server_info(Implementation::new( "goose-tutorial", diff --git a/crates/goose-test-support/src/mcp.rs b/crates/goose-test-support/src/mcp.rs index 34c05d5d6..f3f035a56 100644 --- a/crates/goose-test-support/src/mcp.rs +++ b/crates/goose-test-support/src/mcp.rs @@ -1,6 +1,6 @@ use rmcp::model::{ Annotations, CallToolResult, ContentBlock, Implementation, InitializeResult, ProtocolVersion, - Role, ServerCapabilities, ServerInfo, TextContent, + Role, ServerCapabilities, ServerConfig, TextContent, }; use rmcp::transport::streamable_http_server::{ session::local::LocalSessionManager, StreamableHttpServerConfig, StreamableHttpService, @@ -51,7 +51,7 @@ impl McpFixtureServer { #[tool_handler] impl ServerHandler for McpFixtureServer { - fn get_info(&self) -> ServerInfo { + fn get_info(&self) -> ServerConfig { InitializeResult::new(ServerCapabilities::builder().enable_tools().build()) .with_protocol_version(ProtocolVersion::LATEST) .with_server_info(Implementation::new("mcp-fixture", "1.0.0")) diff --git a/crates/goose/src/agents/extension_manager/mod.rs b/crates/goose/src/agents/extension_manager/mod.rs index 33ca1ff38..1671aa540 100644 --- a/crates/goose/src/agents/extension_manager/mod.rs +++ b/crates/goose/src/agents/extension_manager/mod.rs @@ -33,7 +33,7 @@ use crate::oauth::GooseCredentialStore; use rmcp::model::{ CallToolRequestParams, CallToolResult, ContentBlock, ErrorCode, ErrorData, GetPromptResult, ListResourcesResult, ListToolsResult, MetaObject, Prompt, Resource, ResourceContents, - ServerInfo, ServerNotification, Tool, + ServerConfig, ServerNotification, Tool, }; use schemars::_private::NoSerialize; use serde_json::Value; @@ -110,7 +110,7 @@ struct Extension { resolved_config: ExtensionConfig, client: McpClientBox, - server_info: Option, + server_info: Option, } impl Extension { @@ -118,7 +118,7 @@ impl Extension { config: ExtensionConfig, resolved_config: ExtensionConfig, client: McpClientBox, - server_info: Option, + server_info: Option, ) -> Self { Self { client, @@ -599,7 +599,7 @@ impl ExtensionManager { name: String, config: ExtensionConfig, client: McpClientBox, - info: Option, + info: Option, ) { let normalized = name_to_key(&name); self.extensions.lock().await.insert( diff --git a/crates/goose/src/agents/extension_manager/streamable_http.rs b/crates/goose/src/agents/extension_manager/streamable_http.rs index 722981b73..7cb50a164 100644 --- a/crates/goose/src/agents/extension_manager/streamable_http.rs +++ b/crates/goose/src/agents/extension_manager/streamable_http.rs @@ -6,7 +6,7 @@ use std::time::Duration; use axum::http::{HeaderMap, HeaderName}; use rmcp::model::{ - CallToolResult, ErrorCode, ErrorData, GetPromptResult, ProtocolVersion, ServerInfo, + CallToolResult, ErrorCode, ErrorData, GetPromptResult, ProtocolVersion, ServerConfig, ServerNotification, }; use rmcp::service::{ClientInitializeError, ServiceError}; @@ -298,7 +298,7 @@ pub(super) struct ConnectParams { /// (requesting the union of scopes), reconnect, and retry the request once. struct OAuthStepUpClient { inner: tokio::sync::RwLock, - server_info: Option, + server_info: Option, params: tokio::sync::RwLock, step_up_lock: tokio::sync::Mutex<()>, notification_subscribers: Arc>>>, @@ -456,7 +456,7 @@ impl McpClientTrait for OAuthStepUpClient { .await } - fn get_info(&self) -> Option<&ServerInfo> { + fn get_info(&self) -> Option<&ServerConfig> { self.server_info.as_ref() } diff --git a/crates/goose/src/agents/mcp_client.rs b/crates/goose/src/agents/mcp_client.rs index b8b65b6bd..848bffcd7 100644 --- a/crates/goose/src/agents/mcp_client.rs +++ b/crates/goose/src/agents/mcp_client.rs @@ -12,7 +12,7 @@ use rmcp::model::{ use rmcp::{ model::{ CallToolRequestParams, CallToolResult, CancelledNotificationParam, ClientCapabilities, - ClientInfo, ClientRequest, GetPromptRequestParams, GetPromptResult, Implementation, + ClientConfig, ClientRequest, GetPromptRequestParams, GetPromptResult, Implementation, InitializeRequestParams, InitializeResult, ListPromptsResult, ListResourcesResult, ListToolsResult, Notification, PaginatedRequestParams, ProtocolVersion, ReadResourceRequestParams, ReadResourceResult, Request, RequestId, RequestOptionalParam, @@ -460,7 +460,7 @@ impl ClientHandler for GooseClient { }) } - fn get_info(&self) -> ClientInfo { + fn get_info(&self) -> ClientConfig { let extensions = self.resolved_extensions(); InitializeRequestParams::new(