From 64b10ceebf6492d18da5aa41f927ba54228e0fe4 Mon Sep 17 00:00:00 2001
From: "Michael A. Smith" <michael@opencoreemr.com>
Date: Mon, 27 Jul 2026 16:30:05 -0400
Subject: [PATCH] fix(acp): forward Claude Code model picker selection to the
 adapter (#10675)

---
 crates/goose/src/providers/claude_acp.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/goose/src/providers/claude_acp.rs b/crates/goose/src/providers/claude_acp.rs
index d01ae6965..fcf20bcc7 100644
--- a/crates/goose/src/providers/claude_acp.rs
+++ b/crates/goose/src/providers/claude_acp.rs
@@ -82,7 +82,10 @@ impl ProviderDef for ClaudeAcpProvider {
                 mcp_servers: extension_configs_to_mcp_servers(&extensions),
                 session_mode_id: mode_mapping[&goose_mode].first().cloned(),
                 session_config_options: vec![],
-                model_config_option_id: None,
+                // claude-agent-acp advertises the model as a "model" select
+                // config option and applies session/set_config_option for it
+                // via query.setModel, so forward the picker's selection.
+                model_config_option_id: Some("model".to_string()),
                 mode_mapping,
                 notification_callback: None,
             };