diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs index 821611e60..549852e36 100644 --- a/codex-rs/core/src/agent/control.rs +++ b/codex-rs/core/src/agent/control.rs @@ -231,9 +231,7 @@ impl AgentControl { &config, ) .await; - let agent_max_threads = config - .effective_agent_max_threads(multi_agent_version) - .map_err(|err| CodexErr::InvalidRequest(err.to_string()))?; + let agent_max_threads = config.effective_agent_max_threads(multi_agent_version); let mut reservation = self.state.reserve_spawn_slot(agent_max_threads)?; let inheritance = SpawnAgentThreadInheritance { shell_snapshot: self @@ -632,9 +630,7 @@ impl AgentControl { &config, ) .await; - let agent_max_threads = config - .effective_agent_max_threads(multi_agent_version) - .map_err(|err| CodexErr::InvalidRequest(err.to_string()))?; + let agent_max_threads = config.effective_agent_max_threads(multi_agent_version); let mut reservation = self.state.reserve_spawn_slot(agent_max_threads)?; let (session_source, agent_metadata) = match session_source { SessionSource::SubAgent(SubAgentSource::ThreadSpawn { diff --git a/codex-rs/core/src/config/config_tests.rs b/codex-rs/core/src/config/config_tests.rs index 87f00fed8..dac828674 100644 --- a/codex-rs/core/src/config/config_tests.rs +++ b/codex-rs/core/src/config/config_tests.rs @@ -9836,7 +9836,7 @@ non_code_mode_only = true assert_eq!( ( config.agent_max_threads, - config.effective_agent_max_threads(MultiAgentVersion::V2)? + config.effective_agent_max_threads(MultiAgentVersion::V2) ), (None, Some(4)) ); @@ -9886,7 +9886,7 @@ enabled = true assert_eq!( ( config.agent_max_threads, - config.effective_agent_max_threads(MultiAgentVersion::V2)? + config.effective_agent_max_threads(MultiAgentVersion::V2) ), (None, Some(3)) ); @@ -9945,7 +9945,7 @@ subagent_usage_hint_text = "" } #[tokio::test] -async fn multi_agent_v2_rejects_agents_max_threads() -> std::io::Result<()> { +async fn multi_agent_v2_feature_rejects_agents_max_threads() -> std::io::Result<()> { let codex_home = TempDir::new()?; std::fs::write( codex_home.path().join(CONFIG_TOML_FILE), @@ -9963,13 +9963,45 @@ max_threads = 3 .build() .await?; let err = config - .effective_agent_max_threads(MultiAgentVersion::V2) + .validate_multi_agent_v2_config() .expect_err("agents.max_threads should conflict with multi_agent_v2"); assert_eq!(err.kind(), std::io::ErrorKind::InvalidInput); assert_eq!( err.to_string(), - "agents.max_threads cannot be set when the multi-agent runtime is v2" + "agents.max_threads cannot be set when features.multi_agent_v2 is enabled" + ); + assert_eq!( + config.effective_agent_max_threads(MultiAgentVersion::V2), + Some(3) + ); + + Ok(()) +} + +#[tokio::test] +async fn catalog_v2_allows_agents_max_threads_when_feature_disabled() -> std::io::Result<()> { + let codex_home = TempDir::new()?; + std::fs::write( + codex_home.path().join(CONFIG_TOML_FILE), + r#"[features.multi_agent_v2] +enabled = false + +[agents] +max_threads = 3 +"#, + )?; + + let config = ConfigBuilder::without_managed_config_for_tests() + .codex_home(codex_home.path().to_path_buf()) + .fallback_cwd(Some(codex_home.path().to_path_buf())) + .build() + .await?; + + config.validate_multi_agent_v2_config()?; + assert_eq!( + config.effective_agent_max_threads(MultiAgentVersion::V2), + Some(3) ); Ok(()) @@ -10231,7 +10263,7 @@ max_concurrent_threads_per_session = 1 assert_eq!( ( config.agent_max_threads, - config.effective_agent_max_threads(MultiAgentVersion::V2)? + config.effective_agent_max_threads(MultiAgentVersion::V2) ), (None, Some(0)) ); diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index 28e97c36a..5b79672b8 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -1286,26 +1286,29 @@ impl Config { } } + pub(crate) fn validate_multi_agent_v2_config(&self) -> std::io::Result<()> { + if self.features.enabled(Feature::MultiAgentV2) && self.agent_max_threads.is_some() { + Err(std::io::Error::new( + std::io::ErrorKind::InvalidInput, + "agents.max_threads cannot be set when features.multi_agent_v2 is enabled", + )) + } else { + Ok(()) + } + } + pub(crate) fn effective_agent_max_threads( &self, multi_agent_version: MultiAgentVersion, - ) -> std::io::Result> { + ) -> Option { match multi_agent_version { - MultiAgentVersion::V2 => { - if self.agent_max_threads.is_some() { - return Err(std::io::Error::new( - std::io::ErrorKind::InvalidInput, - "agents.max_threads cannot be set when the multi-agent runtime is v2", - )); - } - Ok(Some( - self.multi_agent_v2 - .max_concurrent_threads_per_session - .saturating_sub(1), - )) - } + MultiAgentVersion::V2 => Some( + self.multi_agent_v2 + .max_concurrent_threads_per_session + .saturating_sub(1), + ), MultiAgentVersion::Disabled | MultiAgentVersion::V1 => { - Ok(self.agent_max_threads.or(DEFAULT_AGENT_MAX_THREADS)) + self.agent_max_threads.or(DEFAULT_AGENT_MAX_THREADS) } } } diff --git a/codex-rs/core/src/session/mod.rs b/codex-rs/core/src/session/mod.rs index 8ce16de74..3ea33a6bd 100644 --- a/codex-rs/core/src/session/mod.rs +++ b/codex-rs/core/src/session/mod.rs @@ -557,11 +557,8 @@ impl Codex { .await; let multi_agent_version = resolve_multi_agent_version(&conversation_history, inherited_multi_agent_version); - let startup_multi_agent_version = multi_agent_version - .or(model_info.multi_agent_version) - .unwrap_or_else(|| config.multi_agent_version_from_features()); - let _ = config - .effective_agent_max_threads(startup_multi_agent_version) + config + .validate_multi_agent_v2_config() .map_err(|err| CodexErr::InvalidRequest(err.to_string()))?; let base_instructions = config .base_instructions diff --git a/codex-rs/core/src/tools/handlers/agent_jobs.rs b/codex-rs/core/src/tools/handlers/agent_jobs.rs index 25c8f9c4c..360744973 100644 --- a/codex-rs/core/src/tools/handlers/agent_jobs.rs +++ b/codex-rs/core/src/tools/handlers/agent_jobs.rs @@ -116,10 +116,7 @@ async fn build_runner_options( "multi-agent runtime is disabled; this session cannot spawn workers".to_string(), )); } - let agent_max_threads = turn - .config - .effective_agent_max_threads(multi_agent_version) - .map_err(|err| FunctionCallError::Fatal(err.to_string()))?; + let agent_max_threads = turn.config.effective_agent_max_threads(multi_agent_version); if agent_max_threads == Some(0) { return Err(FunctionCallError::RespondToModel( "agent thread limit reached; this session cannot spawn more subagents".to_string(), diff --git a/codex-rs/core/tests/suite/model_runtime_selectors.rs b/codex-rs/core/tests/suite/model_runtime_selectors.rs index c17121b52..15ed519af 100644 --- a/codex-rs/core/tests/suite/model_runtime_selectors.rs +++ b/codex-rs/core/tests/suite/model_runtime_selectors.rs @@ -190,6 +190,7 @@ async fn remote_multi_agent_selector_overrides_feature_flags() -> Result<()> { let mut v2_model = remote_model("test-multi-agent-v2"); v2_model.multi_agent_version = Some(MultiAgentVersion::V2); let v2_body = response_body_for_remote_model(v2_model, |config| { + config.agent_max_threads = Some(3); config .features .enable(Feature::Collab)