clone/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-04-23 22:24:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge upstream/dev/friel/watchdog-runtime-and-prompts into collab stack

Browse Source 
# Conflicts:
#	codex-rs/core/tests/suite/subagent_notifications.rs
This commit is contained in:
Friel
2026-03-30 07:54:32 +00:00
parent ab51df57db 63b1bb2a8e
commit c4e5ccdc77
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
codex-rs/core/tests/suite/spawn_agent_description.rs
View File

@@ -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<String> {
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<String> {
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))
})
}