diff --git a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs index cd19c93d23..4202dcab0b 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs @@ -246,13 +246,18 @@ impl ToolOutput for SpawnAgentResult { async fn spawn_watchdog( agent_control: &crate::agent::AgentControl, - config: Config, + mut config: Config, prompt: String, owner_thread_id: ThreadId, child_depth: i32, interval_s: i64, spawn_source: SessionSource, ) -> crate::error::Result { + config.mcp_servers.set(HashMap::new()).map_err(|err| { + crate::error::CodexErr::UnsupportedOperation(format!( + "failed to clear watchdog MCP servers: {err}" + )) + })?; let target_thread_id = agent_control .spawn_agent(config.clone(), Op::Interrupt, Some(spawn_source)) .await?;