Merge branch 'main' into jackjackbits-optimize-core-systems

* main: (51 commits)
  docs: reflecting benefits of CLI providers (aaif-goose#3399)
  feat: fetch openrouter supported models in `goose configure` (aaif-goose#3347)
  Add the ability to configure rustyline to use a different edit mode (e.g. vi) (aaif-goose#2769)
  docs: update CLI provider guide (aaif-goose#3397)
  Streamable HTTP CLI flag (aaif-goose#3394)
  docs: Show both remote options for extensions in CLI (aaif-goose#3392)
  docs: fix YouTube Transcript MCP package manager (aaif-goose#3390)
  docs: simplify alby mcp (aaif-goose#3379)
  docs: add max turns (aaif-goose#3372)
  feat(cli): add cost estimation per provider for Goose CLI (aaif-goose#3330)
  feat: Allow Ollama for non-tool models for chat only (aaif-goose#3308)
  [cli] Add --provider and --model CLI options to run command (aaif-goose#3295)
  Docs: Lead/worker model in Goose Desktop (aaif-goose#3342)
  revert: refactor: abstract keyring logic to better enable DI (aaif-goose#3358)
  Drop temporal-service binary (aaif-goose#3340)
  docs: add fuzzy search (aaif-goose#3357)
  Fix name of GPT-4.1 System Prompt (aaif-goose#3348) (aaif-goose#3351)
  docs: add goose-mobile (aaif-goose#3315)
  refactor: abstract keyring logic to better enable DI (aaif-goose#3262)
  fix: correct tool use for anthropic (aaif-goose#3311)
  ...

Author: michaelneale

.devcontainer/Dockerfile

@@ -7,4 +7,5 @@ RUN apt-get update && apt-get install -y \
     libdbus-1-dev \
     gnome-keyring \
     libxcb1-dev \
+    protobuf-compiler \
     && apt-get clean

.github/workflows/ci.yml

@@ -25,7 +25,7 @@ jobs:
 
   rust-build-and-test:
     name: Build and Test Rust Project
-    runs-on: ubuntu-latest
+    runs-on: goose
     steps:
       # Add disk space cleanup before linting
       - name: Check disk space before build
@@ -95,7 +95,9 @@ jobs:
       - name: Build and Test
         run: |
           gnome-keyring-daemon --components=secrets --daemonize --unlock <<< 'foobar'
-          source ../bin/activate-hermit && cargo test
+          source ../bin/activate-hermit
+          export CARGO_INCREMENTAL=0
+          cargo test --jobs 2
         working-directory: crates
 
       - name: Check disk space before cleanup
@@ -125,8 +127,11 @@ jobs:
         run: df -h
 
       - name: Lint
-        run: source ./bin/activate-hermit && cargo clippy -- -D warnings
-
+        run: |
+          source ./bin/activate-hermit
+          export CARGO_INCREMENTAL=0
+          cargo clippy --jobs 2 -- -D warnings
+          
   desktop-lint:
     name: Lint Electron Desktop App
     runs-on: macos-latest

Cargo.lock

@@ -4,7 +4,7 @@ resolver = "2"
 
 [workspace.package]
 edition = "2021"
-version = "1.0.32"
+version = "1.0.35"
 authors = ["Block <ai-oss-tools@block.xyz>"]
 license = "Apache-2.0"
 repository = "https://github.com/block/goose"

Cargo.toml

@@ -341,6 +341,16 @@ enum Command {
         )]
         remote_extensions: Vec<String>,
 
+        /// Add streamable HTTP extensions with a URL
+        #[arg(
+            long = "with-streamable-http-extension",
+            value_name = "URL",
+            help = "Add streamable HTTP extensions (can be specified multiple times)",
+            long_help = "Add streamable HTTP extensions from a URL. Can be specified multiple times. Format: 'url...'",
+            action = clap::ArgAction::Append
+        )]
+        streamable_http_extensions: Vec<String>,
+
         /// Add builtin extensions by name
         #[arg(
             long = "with-builtin",
@@ -509,6 +519,16 @@ enum Command {
         )]
         remote_extensions: Vec<String>,
 
+        /// Add streamable HTTP extensions
+        #[arg(
+            long = "with-streamable-http-extension",
+            value_name = "URL",
+            help = "Add streamable HTTP extensions (can be specified multiple times)",
+            long_help = "Add streamable HTTP extensions. Can be specified multiple times. Format: 'url...'",
+            action = clap::ArgAction::Append
+        )]
+        streamable_http_extensions: Vec<String>,
+
         /// Add builtin extensions by name
         #[arg(
             long = "with-builtin",
@@ -546,6 +566,24 @@ enum Command {
             action = clap::ArgAction::Append
         )]
         additional_sub_recipes: Vec<String>,
+
+        /// Provider to use for this run (overrides environment variable)
+        #[arg(
+            long = "provider",
+            value_name = "PROVIDER",
+            help = "Specify the LLM provider to use (e.g., 'openai', 'anthropic')",
+            long_help = "Override the GOOSE_PROVIDER environment variable for this run. Available providers include openai, anthropic, ollama, databricks, gemini-cli, claude-code, and others."
+        )]
+        provider: Option<String>,
+
+        /// Model to use for this run (overrides environment variable)
+        #[arg(
+            long = "model",
+            value_name = "MODEL",
+            help = "Specify the model to use (e.g., 'gpt-4o', 'claude-3.5-sonnet')",
+            long_help = "Override the GOOSE_MODEL environment variable for this run. The model must be supported by the specified provider."
+        )]
+        model: Option<String>,
     },
 
     /// Recipe utilities for validation and deeplinking
@@ -656,6 +694,7 @@ pub async fn cli() -> Result<()> {
             max_turns,
             extensions,
             remote_extensions,
+            streamable_http_extensions,
             builtins,
         }) => {
             return match command {
@@ -696,10 +735,13 @@ pub async fn cli() -> Result<()> {
                         no_session: false,
                         extensions,
                         remote_extensions,
+                        streamable_http_extensions,
                         builtins,
                         extensions_override: None,
                         additional_system_prompt: None,
                         settings: None,
+                        provider: None,
+                        model: None,
                         debug,
                         max_tool_repetitions,
                         max_turns,
@@ -754,13 +796,16 @@ pub async fn cli() -> Result<()> {
             max_turns,
             extensions,
             remote_extensions,
+            streamable_http_extensions,
             builtins,
             params,
             explain,
             render_recipe,
             scheduled_job_id,
             quiet,
             additional_sub_recipes,
+            provider,
+            model,
         }) => {
             let (input_config, session_settings, sub_recipes, final_output_response) = match (
                 instructions,
@@ -841,10 +886,13 @@ pub async fn cli() -> Result<()> {
                 no_session,
                 extensions,
                 remote_extensions,
+                streamable_http_extensions,
                 builtins,
                 extensions_override: input_config.extensions_override,
                 additional_system_prompt: input_config.additional_system_prompt,
                 settings: session_settings,
+                provider,
+                model,
                 debug,
                 max_tool_repetitions,
                 max_turns,
@@ -966,10 +1014,13 @@ pub async fn cli() -> Result<()> {
                     no_session: false,
                     extensions: Vec::new(),
                     remote_extensions: Vec::new(),
+                    streamable_http_extensions: Vec::new(),
                     builtins: Vec::new(),
                     extensions_override: None,
                     additional_system_prompt: None,
                     settings: None::<SessionSettings>,
+                    provider: None,
+                    model: None,
                     debug: false,
                     max_tool_repetitions: None,
                     max_turns: None,

crates/goose-cli/src/cli.rs

@@ -37,10 +37,13 @@ pub async fn agent_generator(
         no_session: false,
         extensions: requirements.external,
         remote_extensions: requirements.remote,
+        streamable_http_extensions: Vec::new(),
         builtins: requirements.builtin,
         extensions_override: None,
         additional_system_prompt: None,
         settings: None,
+        provider: None,
+        model: None,
         debug: false,
         max_tool_repetitions: None,
         interactive: false, // Benchmarking is non-interactive