Allow disabling the multi-agent wait tool (#34887)

## What changed

- Add a default-on `features.multi_agent_v2.wait_agent_enabled` setting.
- Omit `collaboration.wait_agent` from the tool plan when the setting is disabled, independently of `features.current_time_reminder.sleep_tool`.

## Testing

- Cover configuration parsing and tool exposure with both clock sleep states.

GitOrigin-RevId: c2f34c5edd5bc191d6a5ac41d7bbb80708da1202
This commit is contained in:
rka-oai authored and copyberry committed 2026-07-23 06:28:27 +00:00
1 parent 6e0455fdc4
commit 4462b9deef
8 files changed
+149 -7

No files matched your search

+44
View File
@@ -10602,6 +10602,7 @@ multi_agent_mode_hint_text = "Custom mode guidance."
tool_namespace = "agents"
hide_spawn_agent_metadata = true
expose_spawn_agent_model_overrides = false
wait_agent_enabled = false
non_code_mode_only = true
[agents]
@@ -10649,6 +10650,7 @@ max_concurrent_threads_per_session = 9
);
assert!(config.multi_agent_v2.hide_spawn_agent_metadata);
assert!(!config.multi_agent_v2.expose_spawn_agent_model_overrides);
assert!(!config.multi_agent_v2.wait_agent_enabled);
assert!(config.multi_agent_v2.non_code_mode_only);
Ok(())
@@ -10752,6 +10754,48 @@ fn multi_agent_v2_exposes_model_overrides_by_default() {
);
}
#[tokio::test]
async fn multi_agent_v2_allows_disabled_wait_agent_without_sleep_tool() -> std::io::Result<()> {
for config_toml in [
r#"
[features.multi_agent_v2]
enabled = true
wait_agent_enabled = false
"#,
r#"
[features.multi_agent_v2]
enabled = true
wait_agent_enabled = false
[features.current_time_reminder]
enabled = true
sleep_tool = false
"#,
r#"
[features.multi_agent_v2]
enabled = true
wait_agent_enabled = false
[features.current_time_reminder]
enabled = false
sleep_tool = true
"#,
] {
let codex_home = tempdir()?;
let config_toml = toml::from_str(config_toml).expect("TOML should deserialize");
let config = Config::load_from_base_config_with_overrides(
config_toml,
ConfigOverrides::default(),
codex_home.abs(),
)
.await?;
assert!(!config.multi_agent_v2.wait_agent_enabled);
}
Ok(())
}
#[test]
fn multi_agent_v2_preserves_empty_mode_hint_override() {
let config_toml = toml::from_str(
+6
View File
@@ -1177,6 +1177,7 @@ pub struct MultiAgentV2Config {
pub tool_namespace: Option<String>,
pub hide_spawn_agent_metadata: bool,
pub expose_spawn_agent_model_overrides: bool,
pub wait_agent_enabled: bool,
pub non_code_mode_only: bool,
}
@@ -1200,6 +1201,7 @@ impl MultiAgentV2Config {
tool_namespace: Some(DEFAULT_MULTI_AGENT_V2_TOOL_NAMESPACE.to_string()),
hide_spawn_agent_metadata: true,
expose_spawn_agent_model_overrides: true,
wait_agent_enabled: true,
non_code_mode_only: true,
}
}
@@ -2568,6 +2570,9 @@ fn resolve_multi_agent_v2_config(config_toml: &ConfigToml) -> MultiAgentV2Config
let expose_spawn_agent_model_overrides = base
.and_then(|config| config.expose_spawn_agent_model_overrides)
.unwrap_or(default.expose_spawn_agent_model_overrides);
let wait_agent_enabled = base
.and_then(|config| config.wait_agent_enabled)
.unwrap_or(default.wait_agent_enabled);
let mut default_root_agent_usage_hint_text = default.root_agent_usage_hint_text;
let mut default_subagent_usage_hint_text = default.subagent_usage_hint_text;
if expose_spawn_agent_model_overrides {
@@ -2612,6 +2617,7 @@ fn resolve_multi_agent_v2_config(config_toml: &ConfigToml) -> MultiAgentV2Config
tool_namespace,
hide_spawn_agent_metadata,
expose_spawn_agent_model_overrides,
wait_agent_enabled,
non_code_mode_only,
}
}