Merge origin/main into main

Author: bavadim

.github/workflows/bundle-desktop-windows.yml

@@ -1,6 +1,7 @@
 name: "Bundle Desktop (Windows)"
 
 on:
+  workflow_dispatch:
   workflow_call:
     inputs:
       version:

.gitignore

@@ -71,6 +71,9 @@ crates/goose/tests/mcp_replays/*errors.txt
 # Nix build output
 result
 
+# direnv
+.direnv/
+
 # Goose self-test artifacts
 gooseselftest/
 .tasks/

Cargo.lock

@@ -1,7 +1,7 @@
 use anyhow::Result;
 use fs_err as fs;
 use goose::agents::extension::{Envs, PLATFORM_EXTENSIONS};
-use goose::agents::{Agent, AgentConfig, ExtensionConfig, SessionConfig};
+use goose::agents::{Agent, AgentConfig, ExtensionConfig, GoosePlatform, SessionConfig};
 use goose::builtin_extension::register_builtin_extensions;
 use goose::config::base::CONFIG_YAML_NAME;
 use goose::config::extensions::get_enabled_extensions_with_config;
@@ -325,6 +325,7 @@ impl GooseAcpAgent {
             None,
             self.goose_mode,
             self.disable_session_naming,
+            GoosePlatform::GooseCli,
         ));
         let agent = Arc::new(agent);
 
@@ -737,7 +738,8 @@ impl GooseAcpAgent {
                 let config_path = self.config_dir.join(CONFIG_YAML_NAME);
                 let config = Config::new(&config_path, "goose")?;
                 let model_id = config.get_goose_model()?;
-                goose::model::ModelConfig::new(&model_id)?
+                let provider_name = config.get_goose_provider()?;
+                goose::model::ModelConfig::new(&model_id)?.with_canonical_limits(&provider_name)
             }
         };
         let provider = (self.provider_factory)(model_config, Vec::new()).await?;
@@ -955,9 +957,18 @@ impl GooseAcpAgent {
         session_id: &str,
         model_id: &str,
     ) -> Result<SetSessionModelResponse, sacp::Error> {
-        let model_config = goose::model::ModelConfig::new(model_id).map_err(|e| {
-            sacp::Error::invalid_params().data(format!("Invalid model config: {}", e))
+        let config_path = self.config_dir.join(CONFIG_YAML_NAME);
+        let config = Config::new(&config_path, "goose").map_err(|e| {
+            sacp::Error::internal_error().data(format!("Failed to read config: {}", e))
+        })?;
+        let provider_name = config.get_goose_provider().map_err(|_| {
+            sacp::Error::internal_error().data("No provider configured".to_string())
         })?;
+        let model_config = goose::model::ModelConfig::new(model_id)
+            .map_err(|e| {
+                sacp::Error::invalid_params().data(format!("Invalid model config: {}", e))
+            })?
+            .with_canonical_limits(&provider_name);
         let provider = (self.provider_factory)(model_config, Vec::new())
             .await
             .map_err(|e| {
@@ -1278,20 +1289,14 @@ print(\"hello, world\")
             "mock"
         }
 
-        async fn complete_with_model(
+        async fn stream(
             &self,
-            _session_id: Option<&str>,
             _model_config: &goose::model::ModelConfig,
+            _session_id: &str,
             _system: &str,
             _messages: &[goose::conversation::message::Message],
             _tools: &[rmcp::model::Tool],
-        ) -> Result<
-            (
-                goose::conversation::message::Message,
-                goose::providers::base::ProviderUsage,
-            ),
-            ProviderError,
-        > {
+        ) -> Result<goose::providers::base::MessageStream, ProviderError> {
             unimplemented!()
         }
 

crates/goose-acp/src/server.rs

@@ -38,9 +38,7 @@ impl AcpServer {
             Box::pin(async move {
                 let config_path = config_dir.join(goose::config::base::CONFIG_YAML_NAME);
                 let config = goose::config::Config::new(&config_path, "goose")?;
-                let provider_name = config
-                    .get_goose_provider()
-                    .map_err(|_| anyhow::anyhow!("No provider configured"))?;
+                let provider_name = config.get_goose_provider()?;
                 goose::providers::create(&provider_name, model_config, extensions).await
             })
         });

crates/goose-acp/src/server_factory.rs

@@ -25,7 +25,7 @@ pub async fn run_config_mcp<C: Connection>() {
     let mcp = McpFixture::new(Some(expected_session_id.clone())).await;
 
     let config_yaml = format!(
-        "GOOSE_MODEL: {TEST_MODEL}\nextensions:\n  mcp-fixture:\n    enabled: true\n    type: streamable_http\n    name: mcp-fixture\n    description: MCP fixture\n    uri: \"{}\"\n",
+        "GOOSE_MODEL: {TEST_MODEL}\nGOOSE_PROVIDER: openai\nextensions:\n  mcp-fixture:\n    enabled: true\n    type: streamable_http\n    name: mcp-fixture\n    description: MCP fixture\n    uri: \"{}\"\n",
         mcp.url
     );
     fs::write(temp_dir.path().join(CONFIG_YAML_NAME), config_yaml).unwrap();
@@ -142,7 +142,6 @@ pub async fn run_model_list<C: Connection>() {
             "gpt-5-codex",
             "gpt-5",
             "gpt-5-2025-08-07",
-            "gpt-5-chat-latest",
             "gpt-5-mini",
             "gpt-5-mini-2025-08-07",
             TEST_MODEL,
@@ -172,16 +171,10 @@ pub async fn run_model_list<C: Connection>() {
             "gpt-4o-2024-05-13",
             "gpt-4o-2024-08-06",
             "gpt-4o-2024-11-20",
-            "text-embedding-3-large",
-            "text-embedding-3-small",
             "gpt-4",
             "gpt-4-0613",
             "gpt-4-turbo",
             "gpt-4-turbo-2024-04-09",
-            "gpt-3.5-turbo",
-            "gpt-3.5-turbo-0125",
-            "gpt-3.5-turbo-1106",
-            "text-embedding-ada-002",
         ]
         .iter()
         .map(|id| ModelInfo::new(ModelId::new(*id), *id))

crates/goose-acp/tests/common_tests/mod.rs

@@ -199,7 +199,11 @@ pub async fn spawn_acp_server_in_process(
     fs::create_dir_all(data_root).unwrap();
     let config_path = data_root.join(goose::config::base::CONFIG_YAML_NAME);
     if !config_path.exists() {
-        fs::write(&config_path, format!("GOOSE_MODEL: {TEST_MODEL}\n")).unwrap();
+        fs::write(
+            &config_path,
+            format!("GOOSE_MODEL: {TEST_MODEL}\nGOOSE_PROVIDER: openai\n"),
+        )
+        .unwrap();
     }
     let provider_factory = provider_factory.unwrap_or_else(|| {
         let base_url = openai_base_url.to_string();

crates/goose-acp/tests/fixtures/mod.rs

@@ -61,6 +61,7 @@ open = "5.3.2"
 url = { workspace = true }
 urlencoding = { workspace = true }
 clap_complete = "4.5.62"
+comfy-table = "7.2.2"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["wincred"] }