From 920313e4ee26418258b07de124f23d10d9368b2a Mon Sep 17 00:00:00 2001 From: Godefroid Chapelle Date: Thu, 1 Oct 2026 19:58:28 +0000 Subject: [PATCH] fix(acp): stamp the implemented protocol version in initialize (#12580) --- crates/goose/src/acp/server.rs | 52 +++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/crates/goose/src/acp/server.rs b/crates/goose/src/acp/server.rs index 4ba4d154d..4d76871f5 100644 --- a/crates/goose/src/acp/server.rs +++ b/crates/goose/src/acp/server.rs @@ -59,6 +59,7 @@ use agent_client_protocol::schema::v1::{ SetSessionModeResponse, StopReason, TextContent, ToolCallId, ToolCallUpdate, Usage, UsageUpdate, }; +use agent_client_protocol::schema::ProtocolVersion; use agent_client_protocol::util::MatchDispatchFrom; use agent_client_protocol::{ Agent as SacpAgent, ByteStreams, Client, ConnectionTo, Dispatch, HandleDispatchFrom, Handled, @@ -1837,7 +1838,7 @@ impl GooseAcpAgent { ) .mcp_capabilities(McpCapabilities::new().http(true)) .meta(agent_capabilities_meta()); - Ok(InitializeResponse::new(args.protocol_version) + Ok(InitializeResponse::new(ProtocolVersion::LATEST) .agent_info(Implementation::new("goose", env!("CARGO_PKG_VERSION"))) .agent_capabilities(capabilities) .auth_methods(vec![AuthMethod::Agent( @@ -3526,6 +3527,55 @@ print(\"hello, world\") ); } + #[tokio::test] + async fn initialize_stamps_the_protocol_version_goose_implements() { + let root = tempfile::tempdir().unwrap(); + let active_runs = Arc::new(ActiveRunRegistry::default()); + let live_voice = Arc::new(LiveVoiceService::from_config(active_runs.clone())); + let provider_factory: AcpProviderFactory = Arc::new( + |_provider_name, _extensions, _working_dir, _use_default_model| { + Box::pin(async { Err(anyhow::anyhow!("unused provider factory")) }) + }, + ); + let agent = GooseAcpAgent::new(GooseAcpAgentOptions { + provider_factory, + builtin_selection: AcpBuiltinSelection::default(), + data_dir: root.path().to_path_buf(), + config_dir: root.path().to_path_buf(), + disable_session_naming: true, + goose_platform: GoosePlatform::GooseCli, + additional_source_roots: Vec::new(), + scheduler: None, + session_cwd: None, + active_runs, + live_voice, + }) + .await + .unwrap(); + + let offered_v2 = agent_client_protocol::schema::ProtocolVersion::from(2u16); + let response = agent + .on_initialize(InitializeRequest::new(offered_v2)) + .await + .unwrap(); + assert_eq!( + response.protocol_version, + agent_client_protocol::schema::ProtocolVersion::V1, + "goose implements ACP v1 and must stamp v1 even when the client offers v2" + ); + + let response = agent + .on_initialize(InitializeRequest::new( + agent_client_protocol::schema::ProtocolVersion::V1, + )) + .await + .unwrap(); + assert_eq!( + response.protocol_version, + agent_client_protocol::schema::ProtocolVersion::V1 + ); + } + #[test] fn test_goose_custom_notifications_capability_reads_client_meta() { let mut goose_meta = serde_json::Map::new();