feat: MCP support for agentic CLI providers

Thread ExtensionConfig through ProviderDef::from_env so CLI providers
(claude-code, codex) connect to MCP servers at construction time and
call tools internally.

Extract McpFixture and test assets into goose-test-support crate,
shared by goose-acp and providers.rs integration tests. Both CLI
providers now run the full test suite (basic response, tool usage,
context length, image content) against a real MCP fixture server.

Improve claude_code.rs with persistent stream-json sessions and content
blocks. Replace codex.rs two-pass message handling with single-pass
prepare_input. Convert all 23 ProviderDef implementations from manual
BoxFuture to #[async_trait] and inline from_env into the trait impl.

Signed-off-by: Adrian Cole <adrian@tetrate.io>

Author: codefromthecrypt

Cargo.lock

@@ -10,13 +10,12 @@ crates/goose-mcp/src/computercontroller/pdf_tool.rs::pdf_tool
 crates/goose-mcp/src/memory/mod.rs::new
 crates/goose-server/src/openapi.rs::convert_typed_schema
 crates/goose-server/src/openapi.rs::convert_typed_schema
-crates/goose-server/src/routes/audio.rs::transcribe_elevenlabs_handler
-crates/goose-server/src/routes/audio.rs::transcribe_elevenlabs_handler
 crates/goose/src/agents/agent.rs::create_recipe
 crates/goose/src/agents/agent.rs::dispatch_tool_call
 crates/goose/src/agents/agent.rs::reply
 crates/goose/src/agents/agent.rs::reply_internal
-crates/goose/src/providers/canonical/build_canonical_models.rs::build_canonical_models
+crates/goose/src/providers/claude_code.rs::execute_command
+crates/goose/src/providers/codex.rs::execute_command
 crates/goose/src/providers/formats/anthropic.rs::format_messages
 crates/goose/src/providers/formats/anthropic.rs::response_to_streaming_message
 crates/goose/src/providers/formats/databricks.rs::format_messages

clippy-baselines/too_many_lines.txt

@@ -43,6 +43,7 @@ uuid = { version = "1.11", features = ["v7"] }
 [dev-dependencies]
 assert-json-diff = "2.0.2"
 async-trait = "0.1.89"
+goose-test-support = { path = "../goose-test-support" }
 wiremock = { workspace = true }
 tempfile = "3"
 test-case = { workspace = true }

crates/goose-acp/Cargo.toml

@@ -298,7 +298,8 @@ impl GooseAcpAgent {
             fast_model: None,
             request_params: None,
         };
-        let provider = create(&provider_name, model_config).await?;
+        let extensions = get_enabled_extensions_with_config(config);
+        let provider = create(&provider_name, model_config, extensions).await?;
         let goose_mode = config
             .get_goose_mode()
             .unwrap_or(goose::config::GooseMode::Auto);

crates/goose-acp/src/server.rs

@@ -1,4 +1,5 @@
 use anyhow::Result;
+use goose::config::extensions::get_enabled_extensions_with_config;
 use goose::config::paths::Paths;
 use goose::config::Config;
 use goose::model::ModelConfig;
@@ -55,7 +56,8 @@ impl AcpServer {
             fast_model: None,
         };
 
-        let provider = create(&provider_name, model_config).await?;
+        let extensions = get_enabled_extensions_with_config(global_config);
+        let provider = create(&provider_name, model_config, extensions).await?;
         let goose_mode = global_config
             .get_goose_mode()
             .unwrap_or(goose::config::GooseMode::Auto);

crates/goose-acp/src/server_factory.rs

@@ -4,13 +4,11 @@
 
 #[path = "../fixtures/mod.rs"]
 pub mod fixtures;
-use fixtures::{
-    ExpectedSessionId, McpFixture, OpenAiFixture, PermissionDecision, Session, TestSessionConfig,
-    FAKE_CODE,
-};
+use fixtures::{OpenAiFixture, PermissionDecision, Session, TestSessionConfig};
 use fs_err as fs;
 use goose::config::base::CONFIG_YAML_NAME;
 use goose::config::GooseMode;
+use goose_test_support::{ExpectedSessionId, McpFixture, FAKE_CODE};
 use sacp::schema::{McpServer, McpServerHttp, ToolCallStatus};
 
 pub async fn run_basic_completion<S: Session>() {
@@ -25,7 +23,7 @@ pub async fn run_basic_completion<S: Session>() {
     .await;
 
     let mut session = S::new(TestSessionConfig::default(), openai).await;
-    expected_session_id.set(session.id());
+    expected_session_id.set(session.id().0.to_string());
 
     let output = session
         .prompt("what is 1+1", PermissionDecision::Cancel)
@@ -36,7 +34,7 @@ pub async fn run_basic_completion<S: Session>() {
 
 pub async fn run_mcp_http_server<S: Session>() {
     let expected_session_id = ExpectedSessionId::default();
-    let mcp = McpFixture::new(expected_session_id.clone()).await;
+    let mcp = McpFixture::new(Some(expected_session_id.clone())).await;
     let openai = OpenAiFixture::new(
         vec![
             (
@@ -57,7 +55,7 @@ pub async fn run_mcp_http_server<S: Session>() {
         ..Default::default()
     };
     let mut session = S::new(config, openai).await;
-    expected_session_id.set(session.id());
+    expected_session_id.set(session.id().0.to_string());
 
     let output = session
         .prompt(
@@ -73,7 +71,7 @@ pub async fn run_builtin_and_mcp<S: Session>() {
     let expected_session_id = ExpectedSessionId::default();
     let prompt =
         "Search for getCode and textEditor tools. Use them to save the code to /tmp/result.txt.";
-    let mcp = McpFixture::new(expected_session_id.clone()).await;
+    let mcp = McpFixture::new(Some(expected_session_id.clone())).await;
     let openai = OpenAiFixture::new(
         vec![
             (
@@ -102,7 +100,7 @@ pub async fn run_builtin_and_mcp<S: Session>() {
     let _ = fs::remove_file("/tmp/result.txt");
 
     let mut session = S::new(config, openai).await;
-    expected_session_id.set(session.id());
+    expected_session_id.set(session.id().0.to_string());
 
     let output = session.prompt(prompt, PermissionDecision::Cancel).await;
     if matches!(output.tool_status, Some(ToolCallStatus::Failed)) || output.text.contains("error") {
@@ -134,7 +132,7 @@ pub async fn run_permission_persistence<S: Session>() {
     let temp_dir = tempfile::tempdir().unwrap();
     let prompt = "Use the get_code tool and output only its result.";
     let expected_session_id = ExpectedSessionId::default();
-    let mcp = McpFixture::new(expected_session_id.clone()).await;
+    let mcp = McpFixture::new(Some(expected_session_id.clone())).await;
     let openai = OpenAiFixture::new(
         vec![
             (
@@ -158,7 +156,7 @@ pub async fn run_permission_persistence<S: Session>() {
     };
 
     let mut session = S::new(config, openai).await;
-    expected_session_id.set(session.id());
+    expected_session_id.set(session.id().0.to_string());
 
     for (decision, expected_status, expected_yaml) in cases {
         session.reset_openai();
@@ -186,7 +184,7 @@ pub async fn run_configured_extension<S: Session>() {
     let temp_dir = tempfile::tempdir().unwrap();
     let expected_session_id = ExpectedSessionId::default();
     let prompt = "Use the get_code tool and output only its result.";
-    let mcp = McpFixture::new(expected_session_id.clone()).await;
+    let mcp = McpFixture::new(Some(expected_session_id.clone())).await;
 
     let config_yaml = format!(
         "extensions:\n  lookup:\n    enabled: true\n    type: streamable_http\n    name: lookup\n    description: Lookup server\n    uri: \"{}\"\n",
@@ -215,7 +213,7 @@ pub async fn run_configured_extension<S: Session>() {
     };
 
     let mut session = S::new(config, openai).await;
-    expected_session_id.set(session.id());
+    expected_session_id.set(session.id().0.to_string());
 
     let output = session.prompt(prompt, PermissionDecision::Cancel).await;
     assert_eq!(output.text, FAKE_CODE);