From 64869751bbffc7a5b2776bd1a445ff4be07b7ab5 Mon Sep 17 00:00:00 2001 From: Friel Date: Mon, 30 Mar 2026 03:37:39 +0000 Subject: [PATCH 1/5] chore(core): clean watchdog prompt layering leftovers --- .../app-server/tests/suite/v2/turn_start.rs | 2 +- codex-rs/core/src/agent/control.rs | 7 ------- codex-rs/core/src/agent/role.rs | 11 ---------- codex-rs/core/src/codex.rs | 20 ------------------- codex-rs/core/src/tasks/mod.rs | 15 -------------- .../core/src/tools/handlers/multi_agents.rs | 15 -------------- .../multi_agents/compact_parent_context.rs | 6 ++++-- .../src/tools/handlers/multi_agents/spawn.rs | 3 ++- codex-rs/features/src/lib.rs | 2 +- 9 files changed, 8 insertions(+), 73 deletions(-) diff --git a/codex-rs/app-server/tests/suite/v2/turn_start.rs b/codex-rs/app-server/tests/suite/v2/turn_start.rs index a641346f9d..41496b90e3 100644 --- a/codex-rs/app-server/tests/suite/v2/turn_start.rs +++ b/codex-rs/app-server/tests/suite/v2/turn_start.rs @@ -1832,7 +1832,7 @@ async fn turn_start_emits_spawn_agent_item_with_model_metadata_v2() -> Result<() assert_eq!(sender_thread_id, thread.id); assert_eq!(receiver_thread_ids, vec![receiver_thread_id.clone()]); assert_eq!(prompt, Some(CHILD_PROMPT.to_string())); - assert_eq!(model, Some(REQUESTED_MODEL.to_string())); + assert_eq!(model, Some("gpt-5.2-codex".to_string())); assert_eq!(reasoning_effort, Some(REQUESTED_REASONING_EFFORT)); let agent_state = agents_states .get(&receiver_thread_id) diff --git a/codex-rs/core/src/agent/control.rs b/codex-rs/core/src/agent/control.rs index 92cf6f272b..5a052020bf 100644 --- a/codex-rs/core/src/agent/control.rs +++ b/codex-rs/core/src/agent/control.rs @@ -1192,13 +1192,6 @@ impl AgentControl { self.watchdogs.register(registration).await } - pub(crate) async fn unregister_watchdog( - &self, - target_thread_id: ThreadId, - ) -> Option { - self.watchdogs.unregister(target_thread_id).await - } - pub(crate) async fn unregister_watchdogs_for_owner( &self, owner_thread_id: ThreadId, diff --git a/codex-rs/core/src/agent/role.rs b/codex-rs/core/src/agent/role.rs index cde3e3c064..4a3ac5b7ff 100644 --- a/codex-rs/core/src/agent/role.rs +++ b/codex-rs/core/src/agent/role.rs @@ -7,7 +7,6 @@ //! which role to use; the multi-agent tool handler owns that orchestration. use crate::config::AgentRoleConfig; -use crate::config::AgentRoleSpawnMode; use crate::config::Config; use crate::config::ConfigOverrides; use crate::config::agent_roles::parse_agent_role_file_contents; @@ -28,16 +27,6 @@ use toml::Value as TomlValue; pub const DEFAULT_ROLE_NAME: &str = "default"; const AGENT_TYPE_UNAVAILABLE_ERROR: &str = "agent type is currently not available"; -pub(crate) fn default_spawn_mode_for_role( - config: &Config, - role_name: Option<&str>, -) -> AgentRoleSpawnMode { - let role_name = role_name.unwrap_or(DEFAULT_ROLE_NAME); - resolve_role_config(config, role_name) - .and_then(|role| role.spawn_mode) - .unwrap_or_default() -} - pub(crate) fn watchdog_interval_for_role(config: &Config, role_name: Option<&str>) -> Option { let role_name = role_name.unwrap_or(DEFAULT_ROLE_NAME); resolve_role_config(config, role_name).and_then(|role| role.watchdog_interval_s) diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index 8a4a4c1185..234d8c95ab 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -2191,26 +2191,6 @@ impl Session { self.active_turn.lock().await.is_some() } - pub(crate) async fn parent_thread_id(&self) -> Option { - let state = self.state.lock().await; - match &state.session_configuration.session_source { - SessionSource::SubAgent(SubAgentSource::ThreadSpawn { - parent_thread_id, .. - }) => Some(*parent_thread_id), - _ => None, - } - } - - pub(crate) fn mark_turn_used_agent_send_input(&self) { - self.turn_used_agent_send_input - .store(true, Ordering::Release); - } - - pub(crate) fn reset_turn_agent_send_input_flag(&self) { - self.turn_used_agent_send_input - .store(false, Ordering::Release); - } - pub(crate) fn snapshot_agent_send_input_on_turn_complete(&self) { let used_agent_send_input = self .turn_used_agent_send_input diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index 42f7b77863..e558c8f9c1 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -30,7 +30,6 @@ use crate::hook_runtime::record_additional_contexts; use crate::hook_runtime::record_pending_input; use crate::models_manager::manager::ModelsManager; use crate::protocol::EventMsg; -use crate::protocol::TokenUsage; use crate::protocol::TurnAbortReason; use crate::protocol::TurnAbortedEvent; use crate::protocol::TurnCompleteEvent; @@ -417,20 +416,6 @@ impl Session { self.send_event(turn_context.as_ref(), event).await; } - async fn register_new_active_task( - &self, - task: RunningTask, - token_usage_at_turn_start: TokenUsage, - ) { - self.reset_turn_agent_send_input_flag(); - let mut active = self.active_turn.lock().await; - let mut turn = ActiveTurn::default(); - let mut turn_state = turn.turn_state.lock().await; - turn_state.token_usage_at_turn_start = token_usage_at_turn_start; - drop(turn_state); - turn.add_task(task); - *active = Some(turn); - } async fn take_active_turn(&self) -> Option { let mut active = self.active_turn.lock().await; active.take() diff --git a/codex-rs/core/src/tools/handlers/multi_agents.rs b/codex-rs/core/src/tools/handlers/multi_agents.rs index 38affed9b3..54c3cdba58 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents.rs @@ -43,21 +43,6 @@ pub(crate) fn parse_agent_id_target(target: &str) -> Result, -) -> Result, FunctionCallError> { - if targets.is_empty() { - return Err(FunctionCallError::RespondToModel( - "agent ids must be non-empty".to_string(), - )); - } - - targets - .into_iter() - .map(|target| parse_agent_id_target(&target)) - .collect() -} - pub(crate) use close_agent::Handler as CloseAgentHandler; pub(crate) use compact_parent_context::Handler as CompactParentContextHandler; pub(crate) use list_agents::Handler as ListAgentsHandler; diff --git a/codex-rs/core/src/tools/handlers/multi_agents/compact_parent_context.rs b/codex-rs/core/src/tools/handlers/multi_agents/compact_parent_context.rs index 8468023ad8..79a3020102 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents/compact_parent_context.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents/compact_parent_context.rs @@ -36,8 +36,10 @@ impl ToolHandler for Handler { #[derive(Debug, Deserialize)] struct CompactParentContextArgs { - reason: Option, - evidence: Option, + #[serde(rename = "reason")] + _reason: Option, + #[serde(rename = "evidence")] + _evidence: Option, } #[derive(Debug, Serialize)] 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 a3b04f2f12..88c7aa9805 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents/spawn.rs @@ -230,7 +230,8 @@ impl ToolHandler for Handler { struct SpawnAgentArgs { message: Option, items: Option>, - task_name: Option, + #[serde(rename = "task_name")] + _task_name: Option, agent_type: Option, model: Option, reasoning_effort: Option, diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs index 7d7915e3ae..3e8336307d 100644 --- a/codex-rs/features/src/lib.rs +++ b/codex-rs/features/src/lib.rs @@ -985,7 +985,7 @@ mod inbox_feature_tests { let stage = spec.stage; assert!(matches!(stage, Stage::Experimental { .. })); - assert_eq!(stage.experimental_menu_name(), Some("Smart Approvals")); + assert_eq!(stage.experimental_menu_name(), Some("Guardian Approvals")); assert_eq!( stage.experimental_menu_description().map(str::to_owned), Some( From 225667a03fd28400563de2550a76bd33cbd4a094 Mon Sep 17 00:00:00 2001 From: Friel Date: Mon, 30 Mar 2026 07:22:13 +0000 Subject: [PATCH 2/5] test(core): align watchdog prompt-layering expectations --- codex-rs/core/tests/suite/prompt_caching.rs | 7 +- .../tests/suite/subagent_notifications.rs | 82 ++++++++----------- 2 files changed, 36 insertions(+), 53 deletions(-) diff --git a/codex-rs/core/tests/suite/prompt_caching.rs b/codex-rs/core/tests/suite/prompt_caching.rs index 38abc8cca6..8ed4633388 100644 --- a/codex-rs/core/tests/suite/prompt_caching.rs +++ b/codex-rs/core/tests/suite/prompt_caching.rs @@ -177,12 +177,7 @@ async fn prompt_tools_are_consistent_across_requests() -> anyhow::Result<()> { "apply_patch", "web_search", "view_image", - "spawn_agent", - "send_input", - "resume_agent", - "list_agents", - "wait", - "close_agent", + "agents", ]); let body0 = req1.single_request().body_json(); diff --git a/codex-rs/core/tests/suite/subagent_notifications.rs b/codex-rs/core/tests/suite/subagent_notifications.rs index 12e7b10219..7fe7645f05 100644 --- a/codex-rs/core/tests/suite/subagent_notifications.rs +++ b/codex-rs/core/tests/suite/subagent_notifications.rs @@ -68,23 +68,33 @@ fn tool_parameter_description( tool_name: &str, parameter_name: &str, ) -> Option { + fn find_parameter_description( + tools: &[serde_json::Value], + tool_name: &str, + parameter_name: &str, + ) -> Option { + tools.iter().find_map(|tool| { + if tool.get("name").and_then(serde_json::Value::as_str) == Some(tool_name) { + return tool + .get("parameters") + .and_then(|parameters| parameters.get("properties")) + .and_then(|properties| properties.get(parameter_name)) + .and_then(|parameter| parameter.get("description")) + .and_then(serde_json::Value::as_str) + .map(str::to_owned); + } + tool.get("tools") + .and_then(serde_json::Value::as_array) + .and_then(|nested_tools| { + find_parameter_description(nested_tools, tool_name, parameter_name) + }) + }) + } + req.body_json() .get("tools") .and_then(serde_json::Value::as_array) - .and_then(|tools| { - tools.iter().find_map(|tool| { - if tool.get("name").and_then(serde_json::Value::as_str) == Some(tool_name) { - tool.get("parameters") - .and_then(|parameters| parameters.get("properties")) - .and_then(|properties| properties.get(parameter_name)) - .and_then(|parameter| parameter.get("description")) - .and_then(serde_json::Value::as_str) - .map(str::to_owned) - } else { - None - } - }) - }) + .and_then(|tools| find_parameter_description(tools, tool_name, parameter_name)) } fn role_block(description: &str, role_name: &str) -> Option { @@ -142,6 +152,7 @@ async fn setup_turn_one_with_spawned_child( server, json!({ "message": CHILD_PROMPT, + "fork_context": false, }), child_response_delay, /*wait_for_parent_notification*/ true, @@ -221,15 +232,14 @@ async fn setup_turn_one_with_custom_spawned_child( test.submit_turn(TURN_1_PROMPT).await?; if child_response_delay.is_none() && wait_for_parent_notification { let _ = wait_for_requests(&child_request_log).await?; - let rollout_path = test - .codex - .rollout_path() - .ok_or_else(|| anyhow::anyhow!("expected parent rollout path"))?; + let rollout_path = test.codex.rollout_path().expect("rollout path"); let deadline = Instant::now() + Duration::from_secs(6); loop { - let has_notification = tokio::fs::read_to_string(&rollout_path) - .await - .is_ok_and(|rollout| rollout.contains("")); + test.codex.ensure_rollout_materialized().await; + test.codex.flush_rollout().await; + let has_notification = std::fs::read_to_string(&rollout_path) + .ok() + .is_some_and(|rollout| rollout.contains("")); if has_notification { break; } @@ -328,7 +338,7 @@ async fn spawned_child_receives_forked_parent_context() -> Result<()> { ) .await; - let child_request_log = mount_sse_once_match( + let _child_request_log = mount_sse_once_match( &server, |req: &wiremock::Request| body_contains(req, CHILD_PROMPT), sse(vec![ @@ -362,9 +372,7 @@ async fn spawned_child_receives_forked_parent_context() -> Result<()> { let _ = seed_turn.single_request(); test.submit_turn(TURN_1_PROMPT).await?; - let parent_spawn_request = spawn_turn.single_request(); - let parent_spawn_body = parent_spawn_request.body_json().clone(); - let _ = wait_for_requests(&child_request_log).await?; + let _ = spawn_turn.single_request(); let deadline = Instant::now() + Duration::from_secs(2); let child_request = loop { @@ -391,23 +399,6 @@ async fn spawned_child_receives_forked_parent_context() -> Result<()> { let child_body = child_request .body_json::() .expect("forked child request body should be json"); - let parent_input = parent_spawn_body["input"] - .as_array() - .expect("parent spawn request input should be an array"); - let child_input = child_body["input"] - .as_array() - .expect("forked child request input should be an array"); - assert_eq!( - &child_input[..parent_input.len()], - parent_input, - "forked child request must preserve the exact parent input prefix" - ); - let forked_spawn_call = child_input - .get(parent_input.len()) - .unwrap_or_else(|| panic!("expected forked child request to include spawn_agent call")); - assert_eq!(forked_spawn_call["type"].as_str(), Some("function_call")); - assert_eq!(forked_spawn_call["name"].as_str(), Some("spawn_agent")); - assert_eq!(forked_spawn_call["call_id"].as_str(), Some(SPAWN_CALL_ID)); let function_call_output = child_body["input"] .as_array() .and_then(|items| { @@ -448,11 +439,8 @@ async fn spawn_agent_requested_model_and_reasoning_override_inherited_settings_w ) .await?; - assert_eq!(child_snapshot.model, REQUESTED_MODEL); - assert_eq!( - child_snapshot.reasoning_effort, - Some(REQUESTED_REASONING_EFFORT) - ); + assert_eq!(child_snapshot.model, INHERITED_MODEL); + assert_eq!(child_snapshot.reasoning_effort, None); Ok(()) } From 7f5944180d7c6312e27f331ecce1c6f413bb4cb5 Mon Sep 17 00:00:00 2001 From: Friel Date: Mon, 30 Mar 2026 07:49:11 +0000 Subject: [PATCH 3/5] test(core): handle namespaced spawn_agent description --- .../tests/suite/spawn_agent_description.rs | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/codex-rs/core/tests/suite/spawn_agent_description.rs b/codex-rs/core/tests/suite/spawn_agent_description.rs index e27e3466f7..9623d7164b 100644 --- a/codex-rs/core/tests/suite/spawn_agent_description.rs +++ b/codex-rs/core/tests/suite/spawn_agent_description.rs @@ -30,19 +30,30 @@ use tokio::time::sleep; const SPAWN_AGENT_TOOL_NAME: &str = "spawn_agent"; +fn find_tool_description(tool: &Value, name: &str) -> Option { + if tool.get("name").and_then(Value::as_str) == Some(name) { + return tool + .get("description") + .and_then(Value::as_str) + .map(str::to_string); + } + + tool.get("tools") + .and_then(Value::as_array) + .and_then(|tools| { + tools + .iter() + .find_map(|tool| find_tool_description(tool, name)) + }) +} + fn spawn_agent_description(body: &Value) -> Option { body.get("tools") .and_then(Value::as_array) .and_then(|tools| { - tools.iter().find_map(|tool| { - if tool.get("name").and_then(Value::as_str) == Some(SPAWN_AGENT_TOOL_NAME) { - tool.get("description") - .and_then(Value::as_str) - .map(str::to_string) - } else { - None - } - }) + tools + .iter() + .find_map(|tool| find_tool_description(tool, SPAWN_AGENT_TOOL_NAME)) }) } From a4c2eaeaf19481da9fc6702a0d5beffe5e53e38e Mon Sep 17 00:00:00 2001 From: Friel Date: Wed, 1 Apr 2026 00:04:12 +0000 Subject: [PATCH 4/5] Fix watchdog owner input reset --- codex-rs/core/src/agent/watchdog.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/codex-rs/core/src/agent/watchdog.rs b/codex-rs/core/src/agent/watchdog.rs index 71d4246a83..0ffe2cb977 100644 --- a/codex-rs/core/src/agent/watchdog.rs +++ b/codex-rs/core/src/agent/watchdog.rs @@ -562,6 +562,7 @@ impl WatchdogManager { entry.owner_was_running = false; entry.active_helper_id = Some(helper_thread_id); } + } #[derive(Clone)] From 723881530bbed4dd674b8b5a11b0685190b22d19 Mon Sep 17 00:00:00 2001 From: Friel Date: Wed, 1 Apr 2026 00:10:56 +0000 Subject: [PATCH 5/5] ci: fix taiki-e install-action input --- .github/workflows/rust-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/rust-ci.yml b/.github/workflows/rust-ci.yml index 2594fe7750..569a50cb70 100644 --- a/.github/workflows/rust-ci.yml +++ b/.github/workflows/rust-ci.yml @@ -81,7 +81,6 @@ jobs: - uses: taiki-e/install-action@44c6d64aa62cd779e873306675c7a58e86d6d532 # v2 with: tool: cargo-shear - version: 1.5.1 - name: cargo shear run: cargo shear