From d4a60355dd4743b291338ddfa238c8bfa286228b Mon Sep 17 00:00:00 2001
From: Friel <friel@openai.com>
Date: Tue, 7 Apr 2026 17:29:04 +0000
Subject: [PATCH] fix(tools): keep spawn override descriptions unchanged

---
 codex-rs/tools/src/agent_tool.rs       |  8 ++--
 codex-rs/tools/src/agent_tool_tests.rs | 52 --------------------------
 2 files changed, 4 insertions(+), 56 deletions(-)

diff --git a/codex-rs/tools/src/agent_tool.rs b/codex-rs/tools/src/agent_tool.rs
index f26f779630..1a1eeb19dc 100644
--- a/codex-rs/tools/src/agent_tool.rs
+++ b/codex-rs/tools/src/agent_tool.rs
@@ -601,7 +601,7 @@ fn spawn_agent_common_properties_v1(agent_type_description: &str) -> BTreeMap<St
             "model".to_string(),
             JsonSchema::String {
                 description: Some(
-                    "Optional model override for the new agent. Replaces the inherited model only when fork_context is false; forked children always inherit the parent model."
+                    "Optional model override for the new agent. Replaces the inherited model."
                         .to_string(),
                 ),
             },
@@ -610,7 +610,7 @@ fn spawn_agent_common_properties_v1(agent_type_description: &str) -> BTreeMap<St
             "reasoning_effort".to_string(),
             JsonSchema::String {
                 description: Some(
-                    "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort only when fork_context is false; forked children always inherit the parent reasoning effort."
+                    "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort."
                         .to_string(),
                 ),
             },
@@ -645,7 +645,7 @@ fn spawn_agent_common_properties_v2(agent_type_description: &str) -> BTreeMap<St
             "model".to_string(),
             JsonSchema::String {
                 description: Some(
-                    "Optional model override for the new agent. Replaces the inherited model only when fork_turns is `none`; forked children always inherit the parent model."
+                    "Optional model override for the new agent. Replaces the inherited model."
                         .to_string(),
                 ),
             },
@@ -654,7 +654,7 @@ fn spawn_agent_common_properties_v2(agent_type_description: &str) -> BTreeMap<St
             "reasoning_effort".to_string(),
             JsonSchema::String {
                 description: Some(
-                    "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort only when fork_turns is `none`; forked children always inherit the parent reasoning effort."
+                    "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort."
                         .to_string(),
                 ),
             },
diff --git a/codex-rs/tools/src/agent_tool_tests.rs b/codex-rs/tools/src/agent_tool_tests.rs
index 074621f73c..fc1de7bc76 100644
--- a/codex-rs/tools/src/agent_tool_tests.rs
+++ b/codex-rs/tools/src/agent_tool_tests.rs
@@ -94,58 +94,6 @@ fn spawn_agent_tool_v1_keeps_legacy_fork_context_field() {
 
     assert!(properties.contains_key("fork_context"));
     assert!(!properties.contains_key("fork_turns"));
-    assert_eq!(
-        properties.get("model"),
-        Some(&JsonSchema::String {
-            description: Some(
-                "Optional model override for the new agent. Replaces the inherited model only when fork_context is false; forked children always inherit the parent model."
-                    .to_string(),
-            ),
-        })
-    );
-    assert_eq!(
-        properties.get("reasoning_effort"),
-        Some(&JsonSchema::String {
-            description: Some(
-                "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort only when fork_context is false; forked children always inherit the parent reasoning effort."
-                    .to_string(),
-            ),
-        })
-    );
-}
-
-#[test]
-fn spawn_agent_tool_v2_documents_that_forked_children_ignore_model_overrides() {
-    let tool = create_spawn_agent_tool_v2(SpawnAgentToolOptions {
-        available_models: &[],
-        agent_type_description: "role help".to_string(),
-    });
-
-    let ToolSpec::Function(ResponsesApiTool { parameters, .. }) = tool else {
-        panic!("spawn_agent should be a function tool");
-    };
-    let JsonSchema::Object { properties, .. } = parameters else {
-        panic!("spawn_agent should use object params");
-    };
-
-    assert_eq!(
-        properties.get("model"),
-        Some(&JsonSchema::String {
-            description: Some(
-                "Optional model override for the new agent. Replaces the inherited model only when fork_turns is `none`; forked children always inherit the parent model."
-                    .to_string(),
-            ),
-        })
-    );
-    assert_eq!(
-        properties.get("reasoning_effort"),
-        Some(&JsonSchema::String {
-            description: Some(
-                "Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort only when fork_turns is `none`; forked children always inherit the parent reasoning effort."
-                    .to_string(),
-            ),
-        })
-    );
 }
 
 #[test]