From 65a98ae481c471a71f36cfa13f7355ea6a62ec47 Mon Sep 17 00:00:00 2001
From: Friel <friel@openai.com>
Date: Mon, 4 May 2026 01:38:37 +0000
Subject: [PATCH] Fix watchdog parent messaging tests

---
 codex-rs/core/src/agent/control_tests.rs | 3 ---
 codex-rs/tools/src/agent_tool_tests.rs   | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/codex-rs/core/src/agent/control_tests.rs b/codex-rs/core/src/agent/control_tests.rs
index 6a586dad99..3ab53d3ce7 100644
--- a/codex-rs/core/src/agent/control_tests.rs
+++ b/codex-rs/core/src/agent/control_tests.rs
@@ -1436,7 +1436,6 @@ async fn spawn_agent_can_fork_parent_thread_history_with_sanitized_items() {
             SpawnAgentOptions {
                 fork_parent_spawn_call_id: Some(parent_spawn_call_id.clone()),
                 fork_mode: Some(SpawnAgentForkMode::FullHistory),
-                fork_parent_spawn_call_id: Some(parent_spawn_call_id),
                 ..Default::default()
             },
         )
@@ -1757,7 +1756,6 @@ async fn spawn_agent_fork_flushes_parent_rollout_before_loading_history() {
             SpawnAgentOptions {
                 fork_parent_spawn_call_id: Some(parent_spawn_call_id.clone()),
                 fork_mode: Some(SpawnAgentForkMode::FullHistory),
-                fork_parent_spawn_call_id: Some(parent_spawn_call_id),
                 ..Default::default()
             },
         )
@@ -1868,7 +1866,6 @@ async fn spawn_agent_fork_last_n_turns_keeps_only_recent_turns() {
             SpawnAgentOptions {
                 fork_parent_spawn_call_id: Some(parent_spawn_call_id.clone()),
                 fork_mode: Some(SpawnAgentForkMode::LastNTurns(2)),
-                fork_parent_spawn_call_id: Some(parent_spawn_call_id),
                 ..Default::default()
             },
         )
diff --git a/codex-rs/tools/src/agent_tool_tests.rs b/codex-rs/tools/src/agent_tool_tests.rs
index 3157cfc547..150700e204 100644
--- a/codex-rs/tools/src/agent_tool_tests.rs
+++ b/codex-rs/tools/src/agent_tool_tests.rs
@@ -154,7 +154,9 @@ fn send_message_tool_requires_message_and_has_no_output_schema() {
         properties
             .get("target")
             .and_then(|schema| schema.description.as_deref()),
-        Some("Relative or canonical task name to message (from spawn_agent).")
+        Some(
+            "Relative or canonical task name to message (from spawn_agent), or `parent` from a spawned non-watchdog agent."
+        )
     );
     assert_eq!(
         parameters.required.as_ref(),