openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-11-07 20:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev/friel/fork-context-inherits-parent-model' into repair/collab-stack-refresh-20260402

Browse Source 
# Conflicts:
#	codex-rs/core/config.schema.json
#	codex-rs/core/src/agent/role.rs
#	codex-rs/core/src/tools/handlers/multi_agents/spawn.rs
#	codex-rs/core/src/tools/handlers/multi_agents_tests.rs
#	codex-rs/core/src/tools/handlers/multi_agents_v2/spawn.rs
#	codex-rs/core/tests/suite/subagent_notifications.rs
#	codex-rs/tools/src/agent_tool_tests.rs
This commit is contained in:
Friel
2026-04-02 11:38:41 +00:00
parent 4855a58030 3adabaef41
commit 4f53c8b83a
13 changed files with 373 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tools/src/agent_tool.rs
+4 -4
View File
@@ -699,7 +699,7 @@ fn spawn_agent_common_properties(agent_type_description: &str) -> BTreeMap<Strin
"model".to_string(),
JsonSchema::String {
description: Some(
"Optional model override for the new agent. Replaces the inherited model."
"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(),
),
},
@@ -722,7 +722,7 @@ fn spawn_agent_common_properties(agent_type_description: &str) -> BTreeMap<Strin
"reasoning_effort".to_string(),
JsonSchema::String {
description: Some(
"Optional reasoning effort override for the new agent. Replaces the inherited reasoning effort."
"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(),
),
},
@@ -787,7 +787,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."
"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(),
),
},
@@ -810,7 +810,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."
"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(),
),
},
codex-rs/tools/src/agent_tool_tests.rs
+54
View File
@@ -115,6 +115,60 @@ fn spawn_agent_tool_v1_includes_model_fallback_list() {
panic!("model_fallback_list should be an array");
};
assert!(properties.contains_key("model_fallback_list"));
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]