From 4ea10fb41de1a96aa943235e14b878a15decd263 Mon Sep 17 00:00:00 2001 From: Friel Date: Wed, 1 Apr 2026 22:38:29 +0000 Subject: [PATCH 1/3] test(core): assert collab tools remain top-level --- codex-rs/core/src/tools/spec_tests.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codex-rs/core/src/tools/spec_tests.rs b/codex-rs/core/src/tools/spec_tests.rs index 0aeacbd6ee..3294f2367e 100644 --- a/codex-rs/core/src/tools/spec_tests.rs +++ b/codex-rs/core/src/tools/spec_tests.rs @@ -548,6 +548,10 @@ fn test_build_specs_watchdog_collab_tools_include_self_close_tool() { .build(); assert_contains_top_level_tool_name(&tools, "watchdog"); + assert_contains_top_level_tool_name(&tools, "spawn_agent"); + assert_contains_top_level_tool_name(&tools, "send_input"); + assert_contains_top_level_tool_name(&tools, "wait_agent"); + assert_contains_top_level_tool_name(&tools, "close_agent"); assert_contains_tool_names(&tools, &["tool_search", "list_agents", "close_agent"]); assert_lacks_top_level_tool_name(&tools, "watchdog_self_close"); assert_lacks_top_level_tool_name(&tools, "compact_parent_context"); From c8adee15b781ea868985f823e4f81005d3e11bfa Mon Sep 17 00:00:00 2001 From: Friel Date: Wed, 1 Apr 2026 23:43:33 +0000 Subject: [PATCH 2/3] test(core): assert list_agents remains top-level --- codex-rs/core/src/tools/spec_tests.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/codex-rs/core/src/tools/spec_tests.rs b/codex-rs/core/src/tools/spec_tests.rs index 3294f2367e..35df24643d 100644 --- a/codex-rs/core/src/tools/spec_tests.rs +++ b/codex-rs/core/src/tools/spec_tests.rs @@ -552,6 +552,7 @@ fn test_build_specs_watchdog_collab_tools_include_self_close_tool() { assert_contains_top_level_tool_name(&tools, "send_input"); assert_contains_top_level_tool_name(&tools, "wait_agent"); assert_contains_top_level_tool_name(&tools, "close_agent"); + assert_contains_top_level_tool_name(&tools, "list_agents"); assert_contains_tool_names(&tools, &["tool_search", "list_agents", "close_agent"]); assert_lacks_top_level_tool_name(&tools, "watchdog_self_close"); assert_lacks_top_level_tool_name(&tools, "compact_parent_context"); From 868e9608055f0c3930a64a4a0d083fec21dc38ba Mon Sep 17 00:00:00 2001 From: Friel Date: Thu, 2 Apr 2026 00:19:58 +0000 Subject: [PATCH 3/3] test(core): annotate watchdog helper session source --- codex-rs/core/src/tools/handlers/multi_agents_tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs index cfd51d0e18..4d1a5430e4 100644 --- a/codex-rs/core/src/tools/handlers/multi_agents_tests.rs +++ b/codex-rs/core/src/tools/handlers/multi_agents_tests.rs @@ -98,7 +98,7 @@ async fn attach_watchdog_helper_for_tests( .await .expect("owner thread should start"); let target = agent_control - .spawn_agent_handle(config.clone(), None) + .spawn_agent_handle(config.clone(), /*session_source*/ None) .await .expect("watchdog target thread should start"); let helper = manager