From 9222d9685cacaf644389cf5de1084373d78bab2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugues=20Clou=C3=A2tre?= Date: Wed, 16 Sep 2026 12:38:55 +0000 Subject: [PATCH] fix(subagents): let recipe settings outrank GOOSE_SUBAGENT_MODEL/PROVIDER (#12070) --- .../src/agents/platform_extensions/summon.rs | 131 ++++++++++++------ .../guides/context-engineering/subagents.mdx | 2 +- .../docs/guides/environment-variables.md | 2 + .../docs/guides/recipes/recipe-reference.md | 2 + 4 files changed, 95 insertions(+), 42 deletions(-) diff --git a/crates/goose/src/agents/platform_extensions/summon.rs b/crates/goose/src/agents/platform_extensions/summon.rs index 990c7e9a6..6bb24ecaa 100644 --- a/crates/goose/src/agents/platform_extensions/summon.rs +++ b/crates/goose/src/agents/platform_extensions/summon.rs @@ -1724,6 +1724,7 @@ impl SummonClient { provider_default_model: Option<&str>, ) -> Result { let env_model = std::env::var("GOOSE_SUBAGENT_MODEL").ok(); + let env_provider = std::env::var("GOOSE_SUBAGENT_PROVIDER").ok(); let recipe_settings = recipe.settings.as_ref(); let configured = Config::global().all_values().ok(); let configured_provider = configured @@ -1736,22 +1737,24 @@ impl SummonClient { .and_then(serde_json::Value::as_str); let matches_provider = |candidate: Option<&str>| candidate.is_none() || candidate == Some(provider_name); - let model = env_model + let model = recipe_settings + .and_then(|settings| settings.goose_model.clone()) + .filter(|_| { + matches_provider( + recipe_settings.and_then(|settings| settings.goose_provider.as_deref()), + ) + }) + .or_else(|| { + env_model + .clone() + .filter(|_| matches_provider(env_provider.as_deref())) + }) .or_else(|| { params .model .clone() .filter(|_| matches_provider(params.provider.as_deref())) }) - .or_else(|| { - recipe_settings - .and_then(|settings| settings.goose_model.clone()) - .filter(|_| { - matches_provider( - recipe_settings.and_then(|settings| settings.goose_provider.as_deref()), - ) - }) - }) .or_else(|| { configured_model .filter(|_| matches_provider(configured_provider)) @@ -1820,15 +1823,12 @@ impl SummonClient { anyhow::Error, > { let env_provider = std::env::var("GOOSE_SUBAGENT_PROVIDER").ok(); - let provider_name = env_provider - .clone() + let provider_name = recipe + .settings + .as_ref() + .and_then(|s| s.goose_provider.clone()) + .or_else(|| env_provider.clone()) .or_else(|| params.provider.clone()) - .or_else(|| { - recipe - .settings - .as_ref() - .and_then(|s| s.goose_provider.clone()) - }) .or_else(|| { Config::global() .get_param::("GOOSE_SUBAGENT_PROVIDER") @@ -3243,7 +3243,7 @@ You review code."#; #[tokio::test] #[serial] - async fn test_resolve_model_config_env_var_overrides_recipe_model() { + async fn test_resolve_model_config_recipe_overrides_env_var() { let _env = env_lock::lock_env([ ("GOOSE_CONTEXT_LIMIT", None::<&str>), ("GOOSE_MAX_TOKENS", None::<&str>), @@ -3268,8 +3268,74 @@ You review code."#; ) .expect("resolve_model_config"); assert_eq!( - result.model_name, OVERRIDE_MODEL, - "GOOSE_SUBAGENT_MODEL must take priority over recipe settings" + result.model_name, "recipe-model", + "recipe settings.goose_model must take priority over GOOSE_SUBAGENT_MODEL" + ); + } + + #[tokio::test] + #[serial] + async fn test_resolve_provider_recipe_overrides_env_var() { + let _env = env_lock::lock_env([ + ("GOOSE_CONTEXT_LIMIT", None::<&str>), + ("GOOSE_MAX_TOKENS", None::<&str>), + ("GOOSE_SUBAGENT_PROVIDER", Some("openai")), + ("GOOSE_SUBAGENT_MODEL", None::<&str>), + ("ANTHROPIC_API_KEY", Some("test-key")), + ]); + + let client = SummonClient::new(create_test_context()).unwrap(); + let mut recipe = empty_recipe(); + recipe.settings = Some(crate::recipe::Settings { + goose_provider: Some(PROVIDER.to_string()), + goose_model: None, + temperature: None, + max_turns: None, + }); + let (resolved_provider, _) = client + .resolve_provider( + &DelegateParams::default(), + &recipe, + &session_with(parent_config()), + &[], + ) + .await + .expect("resolve_provider"); + assert_eq!( + resolved_provider.get_name(), + PROVIDER, + "recipe settings.goose_provider must take priority over GOOSE_SUBAGENT_PROVIDER" + ); + } + + #[tokio::test] + #[serial] + async fn test_resolve_model_config_recipe_provider_rejects_env_model_of_other_provider() { + let _env = env_lock::lock_env([ + ("GOOSE_CONTEXT_LIMIT", None::<&str>), + ("GOOSE_MAX_TOKENS", None::<&str>), + ("GOOSE_SUBAGENT_PROVIDER", Some("openai")), + ("GOOSE_SUBAGENT_MODEL", Some("gpt-5.2")), + ("ANTHROPIC_API_KEY", Some("test-key")), + ]); + + let client = SummonClient::new(create_test_context()).unwrap(); + let mut recipe = empty_recipe(); + recipe.settings = Some(crate::recipe::Settings { + goose_provider: Some(PROVIDER.to_string()), + goose_model: None, + temperature: None, + max_turns: None, + }); + let session = crate::session::Session::default(); + let (_, result) = client + .resolve_provider(&DelegateParams::default(), &recipe, &session, &[]) + .await + .expect("resolve_provider"); + + assert_ne!( + result.model_name, "gpt-5.2", + "env model for another provider must not be sent to the recipe provider" ); } @@ -3285,33 +3351,16 @@ You review code."#; ]); let client = SummonClient::new(create_test_context()).unwrap(); - let params = DelegateParams { - provider: Some("openai".to_string()), - model: Some("model-for-another-provider".to_string()), - ..Default::default() - }; - let mut recipe = empty_recipe(); - recipe.settings = Some(crate::recipe::Settings { - goose_provider: Some("openai".to_string()), - goose_model: Some("recipe-model-for-another-provider".to_string()), - temperature: None, - max_turns: None, - }); + let params = DelegateParams::default(); let default_model = providers::get_from_registry(PROVIDER) .await .unwrap() .metadata() .default_model .clone(); - let session = crate::session::Session { - provider_name: Some("openai".to_string()), - model_config: Some(goose_providers::model::ModelConfig::new( - "parent-openai-model", - )), - ..Default::default() - }; + let session = crate::session::Session::default(); let (_, result) = client - .resolve_provider(¶ms, &recipe, &session, &[]) + .resolve_provider(¶ms, &empty_recipe(), &session, &[]) .await .expect("resolve_provider"); diff --git a/documentation/docs/guides/context-engineering/subagents.mdx b/documentation/docs/guides/context-engineering/subagents.mdx index e7b1e4c31..a43ccd527 100644 --- a/documentation/docs/guides/context-engineering/subagents.mdx +++ b/documentation/docs/guides/context-engineering/subagents.mdx @@ -293,7 +293,7 @@ You can override any default by including the setting in your natural language r "Use a research subagent with 30 turns and 20-minute timeout to investigate quantum computing trends" ``` -**Environment variable:** Set `GOOSE_SUBAGENT_MAX_TURNS` to change the default max turns for all subagents. +**Environment variable:** Set `GOOSE_SUBAGENT_MAX_TURNS` to change the default max turns for all subagents. Similarly, `GOOSE_SUBAGENT_MODEL` and `GOOSE_SUBAGENT_PROVIDER` set defaults for the subagent model and provider; recipe [`settings`](/docs/guides/recipes/recipe-reference#settings) take precedence over both. ### Extension Control diff --git a/documentation/docs/guides/environment-variables.md b/documentation/docs/guides/environment-variables.md index 016ff5e36..fcd9ce5f7 100644 --- a/documentation/docs/guides/environment-variables.md +++ b/documentation/docs/guides/environment-variables.md @@ -157,6 +157,8 @@ These variables control how goose manages conversation sessions and context. | `GOOSE_MOIM_MESSAGE_TEXT` | Injects persistent text into goose's [working memory](/docs/guides/context-engineering/using-persistent-instructions) every turn. Useful for behavioral guardrails or persistent reminders. | Any text string | Not set | | `GOOSE_MOIM_MESSAGE_FILE` | Path to a file whose contents are injected into goose's [working memory](/docs/guides/context-engineering/using-persistent-instructions) every turn. Supports `~/`. Max 64 KB per file. | File path | Not set | +For subagents, recipe [`settings.goose_provider` and `settings.goose_model`](/docs/guides/recipes/recipe-reference#settings) take precedence over the `GOOSE_SUBAGENT_PROVIDER` and `GOOSE_SUBAGENT_MODEL` environment variables. + **Examples** ```bash diff --git a/documentation/docs/guides/recipes/recipe-reference.md b/documentation/docs/guides/recipes/recipe-reference.md index 9848f775c..1e93205d5 100644 --- a/documentation/docs/guides/recipes/recipe-reference.md +++ b/documentation/docs/guides/recipes/recipe-reference.md @@ -514,6 +514,8 @@ The `max_turns` setting controls how many iterations an agent can perform before **Common use cases:** Limit execution time for automated workflows, prevent runaway subagents, control resource usage in scheduled jobs. +For subagents, `goose_provider` and `goose_model` in `settings` take precedence over the `GOOSE_SUBAGENT_PROVIDER` and `GOOSE_SUBAGENT_MODEL` environment variables. + #### Example Settings Configuration ```yaml