diff --git a/crates/goose-provider-types/src/formats/anthropic.rs b/crates/goose-provider-types/src/formats/anthropic.rs index ceda368b3..be947a300 100644 --- a/crates/goose-provider-types/src/formats/anthropic.rs +++ b/crates/goose-provider-types/src/formats/anthropic.rs @@ -136,6 +136,13 @@ impl AnthropicFormatOptions { } } +pub fn is_reserved_request_param_key(key: &str) -> bool { + matches!( + key, + "messages" | "model" | "stream" | "max_tokens" | "system" | "tools" + ) +} + pub fn thinking_block_is_stale(message: &Message, current_model: Option<&str>) -> bool { let Some(current_model) = current_model else { return false; diff --git a/crates/goose-providers/src/anthropic.rs b/crates/goose-providers/src/anthropic.rs index 2bbeaff8f..a632fc67e 100644 --- a/crates/goose-providers/src/anthropic.rs +++ b/crates/goose-providers/src/anthropic.rs @@ -9,6 +9,7 @@ use async_trait::async_trait; use futures::TryStreamExt; use reqwest::StatusCode; use serde_json::{json, Value}; +use std::collections::HashMap; use std::io; use tokio::pin; use tokio_util::io::StreamReader; @@ -19,9 +20,9 @@ use super::base::{ }; pub use super::formats::anthropic::AnthropicFormatOptions; use super::formats::anthropic::{ - block_binding_behavior, create_request_for_model, is_thinking_signature_error, - response_to_streaming_message, PrefixMismatchBehavior, ANTHROPIC_PROVIDER_NAME, - INPUT_TRANSFORMATIONS_FIELD, THINKING_BINDING_CONTROLS_BETA, + block_binding_behavior, create_request_for_model, is_reserved_request_param_key, + is_thinking_signature_error, response_to_streaming_message, PrefixMismatchBehavior, + ANTHROPIC_PROVIDER_NAME, INPUT_TRANSFORMATIONS_FIELD, THINKING_BINDING_CONTROLS_BETA, }; use super::openai_compatible::handle_status; use super::retry::ProviderRetry; @@ -163,9 +164,22 @@ impl AnthropicProvider { format_options, )?; payload["stream"] = Value::Bool(true); + if let Some(params) = self + .declared_model(&model_config.model_name) + .and_then(|m| m.request_params.as_ref()) + { + apply_declared_request_params(&mut payload, params); + } Ok(payload) } + fn declared_model(&self, model_name: &str) -> Option<&ModelInfo> { + self.custom_models + .as_ref()? + .iter() + .find(|m| m.name == model_name) + } + async fn post_messages( &self, model_config: &ModelConfig, @@ -461,6 +475,17 @@ fn beta_header_value( (!features.is_empty()).then(|| features.join(",")) } +fn apply_declared_request_params(payload: &mut Value, params: &HashMap) { + let Some(object) = payload.as_object_mut() else { + return; + }; + for (key, value) in params { + if !is_reserved_request_param_key(key) { + object.insert(key.clone(), value.clone()); + } + } +} + fn format_options_for_provider( preserves_thinking: bool, emit_clear_thinking: bool, @@ -880,4 +905,30 @@ mod tests { "Anthropic picker ids must be dashed wire names, not dotted catalog names" ); } + + #[test] + fn apply_declared_request_params_skips_reserved_keys() { + let mut payload = json!({ + "model": "claude-sonnet-4-5", + "stream": true, + "messages": [{"role": "user", "content": "hi"}], + "max_tokens": 8096, + }); + + let params = HashMap::from([ + ("output_config".to_string(), json!({"effort": "low"})), + ("model".to_string(), json!("hijacked")), + ("stream".to_string(), json!(false)), + ("messages".to_string(), json!([])), + ("max_tokens".to_string(), json!(1)), + ]); + + apply_declared_request_params(&mut payload, ¶ms); + + assert_eq!(payload["output_config"], json!({"effort": "low"})); + assert_eq!(payload["model"], json!("claude-sonnet-4-5")); + assert_eq!(payload["stream"], json!(true)); + assert_eq!(payload["messages"].as_array().unwrap().len(), 1); + assert_eq!(payload["max_tokens"], json!(8096)); + } }