Keep agent concurrency guidance when native tools are disabled (#62864)

## Why

Disabling native multi-agent tools also dropped the default guidance about
how many agents can be active in a session. That limit still matters for
agents running on a host that handles turn admission.

## What changed

When `multi_agent_v2.disable_native_tools` is set, root agents and
subagents receive only the configured
`multi_agent_v2.max_concurrent_threads_per_session` in their default role
guidance. Explicit role overrides retain precedence, and empty role text
still suppresses the guidance.

## Testing

Cover both roles with bundled and catalog-provided role text. Update the
request snapshots for explicit and proactive delegation to show the
concurrency hint with native tools hidden.

GitOrigin-RevId: e940e7a7886b69888002307c021607b19bb87cd0
This commit is contained in:
rhan-oai
2026-11-20 23:44:47 +00:00
committed by copyberry
parent 8ecb4c9d0f
commit 663358f98d
9 changed files with 45 additions and 19 deletions
@@ -22,6 +22,8 @@ pub struct AgentTurnAdmissionRequest {
/// A submitted turn can be denied after its input was accepted. Core records that
/// input and reports the error through the ordinary turn lifecycle.
/// Hosts own remote retries, abandoned acquisitions and worker-loss recovery.
/// Default hosted roles advertise `multi_agent_v2.max_concurrent_threads_per_session`.
/// Hosts should set it to their admission limit or override the role text.
pub trait AgentTurnAdmission: Send + Sync {
fn admit_turn(
&self,
+9 -2
View File
@@ -13115,9 +13115,10 @@ expose_spawn_agent_model_overrides = true
}
#[test]
fn multi_agent_v2_disabled_native_tools_omit_default_roles() {
fn multi_agent_v2_disabled_native_tools_keep_only_concurrency() {
let mut config = resolve_multi_agent_v2_config(&ConfigToml::default());
config.disable_native_tools = true;
config.max_concurrent_threads_per_session = 17;
let mut messages = ResolvedModelMessages::bundled().multi_agent();
for catalog_override in [false, true] {
if catalog_override {
@@ -13127,7 +13128,13 @@ fn multi_agent_v2_disabled_native_tools_omit_default_roles() {
let usage_hints = resolve_usage_hints(
&config, messages, /*omit_update_plan_instructions*/ false,
);
assert_eq!((usage_hints.root, usage_hints.subagent), (None, None));
let expected = Some(
crate::context::MultiAgentRoleInstructions::concurrency_only(
/*max_concurrency*/ 17,
),
);
assert_eq!(usage_hints.root, expected);
assert_eq!(usage_hints.subagent, expected);
}
}
+3 -1
View File
@@ -55,7 +55,9 @@ pub(crate) fn resolve_usage_hints(
return None;
}
if config.disable_native_tools {
return None;
return Some(MultiAgentRoleInstructions::concurrency_only(
config.max_concurrent_threads_per_session,
));
}
Some(MultiAgentRoleInstructions::Composed {
base: base.to_owned(),
+1 -1
View File
@@ -2445,7 +2445,7 @@ async fn multi_agent_catalog_parameters(
} else if disable_native_tools {
(
"multi_agent_native_tools_hidden",
"Native tools and native usage guidance are unavailable.",
"The root receives the session concurrency limit with native tools hidden.",
)
} else {
(
@@ -81,6 +81,7 @@ async fn injected_mail_respects_delivery_boundaries() -> anyhow::Result<()> {
.enable(Feature::MultiAgentV2)
.expect("use MAv2");
config.multi_agent_v2.disable_native_tools = true;
config.multi_agent_v2.root_agent_usage_hint_text = Some(String::new());
config.multi_agent_v2.multi_agent_mode_hint_text = Some(String::new());
config
.features
@@ -186,6 +186,7 @@ async fn prepared_child_instructions_preserve_native_inheritance(
config.developer_instructions = Some(PARENT_DEVELOPER.into());
config.multi_agent_v2.subagent_developer_instructions =
subagent_developer.map(str::to_owned);
config.multi_agent_v2.root_agent_usage_hint_text = Some(String::new());
config
.features
.enable(Feature::IncrementalTools)
@@ -2,7 +2,7 @@
source: core/tests/suite/scenarios.rs
expression: "context_snapshot::format_request_history_snapshot(description,\n&mock.requests(),\n&ContextSnapshotOptions::default().include_request_settings(),)"
---
Scenario: Native tools and native usage guidance are unavailable.
Scenario: The root receives the session concurrency limit with native tools hidden.
## Window 1
Settings:
@@ -48,12 +48,14 @@ Settings:
Approval policy is currently never. Do not provide the `sandbox_permissions` for any reason, commands will be rejected.
</permissions instructions>
03:message/developer:
<multi_agent_role>There are 4 available concurrency slots, meaning that up to 4 agents can be active at once, including you.</multi_agent_role>
04:message/developer:
<multi_agent_mode>
Any earlier instruction enabling proactive multi-agent delegation no longer applies. Do not spawn sub-ag...k for sub-agents, delegation, or parallel agent work. [hash=6e1e1baf5a87faf5]
Before calling any multi-agent tool, read the full multi-agent skill using its listed package locator. S...context. If the read fails, make note of the blocker. [hash=104096cdd6a881da]
</multi_agent_mode>
04:message/user:
05:message/user:
<environment_context>
<cwd><CWD></cwd>
<shell><HOST_SHELL></shell>
@@ -61,9 +63,9 @@ Settings:
<timezone><HOST_TIMEZONE></timezone>
<filesystem><workspace_roots><root><CWD></root></workspace_roots><permission_profile type="disabled"><...e="unrestricted" /></permission_profile></filesystem> [hash=d40b2f45cb028888]
</environment_context>
05:message/user:
06:message/user:
Check which agents are working under /root before delegating more work.
06:configuration_update:reasoning={"effort":"low"}
07:configuration_update:reasoning={"effort":"low"}
-- request 2 (turn) --
07:function_call/collaboration.list_agents:{"path_prefix":"/root"}
08:function_call_output:unsupported call: collaborationlist_agents
08:function_call/collaboration.list_agents:{"path_prefix":"/root"}
09:function_call_output:unsupported call: collaborationlist_agents
@@ -48,6 +48,8 @@ Settings:
Approval policy is currently never. Do not provide the `sandbox_permissions` for any reason, commands will be rejected.
</permissions instructions>
03:message/developer:
<multi_agent_role>There are 4 available concurrency slots, meaning that up to 4 agents can be active at once, including you.</multi_agent_role>
04:message/developer:
<multi_agent_mode>
Proactive multi-agent delegation is active. Any earlier developer instruction requiring an explicit user...message changes it. User requests override this hint. [hash=0917619915af4b51]
@@ -55,7 +57,7 @@ Settings:
Before calling any multi-agent tool, read the full multi-agent skill using its listed package locator. S...context. If the read fails, make note of the blocker. [hash=104096cdd6a881da]
</multi_agent_mode>
04:message/user:
05:message/user:
<environment_context>
<cwd><CWD></cwd>
<shell><HOST_SHELL></shell>
@@ -63,9 +65,9 @@ Settings:
<timezone><HOST_TIMEZONE></timezone>
<filesystem><workspace_roots><root><CWD></root></workspace_roots><permission_profile type="disabled"><...e="unrestricted" /></permission_profile></filesystem> [hash=d40b2f45cb028888]
</environment_context>
05:message/user:
06:message/user:
Check which agents are working under /root before delegating more work.
06:configuration_update:reasoning={"effort":"xhigh"}
07:configuration_update:reasoning={"effort":"xhigh"}
-- request 2 (turn) --
07:function_call/collaboration.list_agents:{"path_prefix":"/root"}
08:function_call_output:unsupported call: collaborationlist_agents
08:function_call/collaboration.list_agents:{"path_prefix":"/root"}
09:function_call_output:unsupported call: collaborationlist_agents
@@ -21,7 +21,7 @@ All agents share the same directory. In detail:
/// Multi-agent role text and the captured capabilities used to render its context segment.
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum MultiAgentRoleInstructions {
/// Complete configured role body.
/// Complete role body.
Configured(String),
/// Selected catalog or bundled text, composed with captured runtime guidance.
Composed {
@@ -36,6 +36,10 @@ pub enum MultiAgentRoleInstructions {
impl MultiAgentRoleInstructions {
/// Content classification shared by role producers and inherited-history filtering.
pub const KIND: &str = "multi_agent.role_instructions";
pub fn concurrency_only(max_concurrency: usize) -> Self {
Self::Configured(concurrency_guidance(max_concurrency))
}
}
impl ContextualUserFragment for MultiAgentRoleInstructions {
@@ -79,9 +83,8 @@ impl ContextualUserFragment for MultiAgentRoleInstructions {
String::new()
};
let shared = DEFAULT_MULTI_AGENT_V2_SHARED_USAGE_HINT_TEXT;
let mut text = format!(
"{base}\n{shared}\n{wait_agent_guidance}There are {max_concurrency} available concurrency slots, meaning that up to {max_concurrency} agents can be active at once, including you."
);
let concurrency = concurrency_guidance(*max_concurrency);
let mut text = format!("{base}\n{shared}\n{wait_agent_guidance}{concurrency}");
if *expose_model_overrides {
text.push_str("\n\n");
text.push_str(DEFAULT_MULTI_AGENT_V2_MODEL_OVERRIDE_USAGE_HINT_TEXT);
@@ -92,6 +95,12 @@ impl ContextualUserFragment for MultiAgentRoleInstructions {
}
}
fn concurrency_guidance(max_concurrency: usize) -> String {
format!(
"There are {max_concurrency} available concurrency slots, meaning that up to {max_concurrency} agents can be active at once, including you."
)
}
#[cfg(test)]
#[path = "multi_agent_instructions_tests.rs"]
mod tests;