mirror of
https://github.com/openai/codex.git
synced 2026-11-22 15:15:18 +00:00
Add configurable developer instructions for v2 subagents (#35708)
## What changed - Add `features.multi_agent_v2.subagent_developer_instructions` to override inherited developer instructions for subagents that do not define role-specific instructions. - Preserve role-specific instructions as the higher-precedence setting, and carry the effective instructions through full and bounded forks, compacted histories, and cold resume without duplication. - Treat an unset override as inheritance and a blank override as clearing inherited instructions. ## Testing - Cover configuration parsing and materialization, instruction precedence, fork modes, compaction, role application, and resumed subagents. GitOrigin-RevId: 32321e61abc59b14a1be5f31e6bd6570bb1cd89d
This commit is contained in:
1 parent
3418498f01
commit
49025589b0
14 files changed
+1035
-70
No files matched your search
@@ -10762,6 +10762,7 @@ default_wait_timeout_ms = 30000
|
||||
usage_hint_text = "Custom delegation guidance."
|
||||
root_agent_usage_hint_text = "Root guidance."
|
||||
subagent_usage_hint_text = "Subagent guidance."
|
||||
subagent_developer_instructions = " Delegate carefully. "
|
||||
multi_agent_mode_hint_text = "Custom mode guidance."
|
||||
tool_namespace = "agents"
|
||||
hide_spawn_agent_metadata = true
|
||||
@@ -10804,6 +10805,13 @@ max_concurrent_threads_per_session = 9
|
||||
config.multi_agent_v2.subagent_usage_hint_text.as_deref(),
|
||||
Some("Subagent guidance.")
|
||||
);
|
||||
assert_eq!(
|
||||
config
|
||||
.multi_agent_v2
|
||||
.subagent_developer_instructions
|
||||
.as_deref(),
|
||||
Some("Delegate carefully.")
|
||||
);
|
||||
assert_eq!(
|
||||
config.multi_agent_v2.multi_agent_mode_hint_text.as_deref(),
|
||||
Some("Custom mode guidance.")
|
||||
@@ -10965,11 +10973,13 @@ fn multi_agent_v2_preserves_empty_mode_hint_override() {
|
||||
let config_toml = toml::from_str(
|
||||
r#"[features.multi_agent_v2]
|
||||
multi_agent_mode_hint_text = ""
|
||||
subagent_developer_instructions = " \t "
|
||||
"#,
|
||||
)
|
||||
.expect("multi-agent v2 config should parse");
|
||||
|
||||
let expected = MultiAgentV2Config {
|
||||
subagent_developer_instructions: Some(String::new()),
|
||||
multi_agent_mode_hint_text: Some(String::new()),
|
||||
..resolve_multi_agent_v2_config(&ConfigToml::default())
|
||||
};
|
||||
|
||||
@@ -1250,6 +1250,7 @@ pub struct MultiAgentV2Config {
|
||||
pub usage_hint_text: Option<String>,
|
||||
pub root_agent_usage_hint_text: Option<String>,
|
||||
pub subagent_usage_hint_text: Option<String>,
|
||||
pub subagent_developer_instructions: Option<String>,
|
||||
pub multi_agent_mode_hint_text: Option<String>,
|
||||
pub tool_namespace: Option<String>,
|
||||
pub hide_spawn_agent_metadata: bool,
|
||||
@@ -1274,6 +1275,7 @@ impl MultiAgentV2Config {
|
||||
DEFAULT_MULTI_AGENT_V2_SUBAGENT_USAGE_HINT_TEXT,
|
||||
max_concurrent_threads_per_session,
|
||||
)),
|
||||
subagent_developer_instructions: None,
|
||||
multi_agent_mode_hint_text: None,
|
||||
tool_namespace: Some(DEFAULT_MULTI_AGENT_V2_TOOL_NAMESPACE.to_string()),
|
||||
hide_spawn_agent_metadata: true,
|
||||
@@ -2716,6 +2718,9 @@ fn resolve_multi_agent_v2_config(config_toml: &ConfigToml) -> MultiAgentV2Config
|
||||
base.map(|config| &config.subagent_usage_hint_text),
|
||||
default_subagent_usage_hint_text,
|
||||
);
|
||||
let subagent_developer_instructions = base
|
||||
.and_then(|config| config.subagent_developer_instructions.as_ref())
|
||||
.map(|instructions| instructions.trim().to_string());
|
||||
let multi_agent_mode_hint_text = base
|
||||
.and_then(|config| config.multi_agent_mode_hint_text.as_ref())
|
||||
.cloned()
|
||||
@@ -2736,6 +2741,7 @@ fn resolve_multi_agent_v2_config(config_toml: &ConfigToml) -> MultiAgentV2Config
|
||||
usage_hint_text,
|
||||
root_agent_usage_hint_text,
|
||||
subagent_usage_hint_text,
|
||||
subagent_developer_instructions,
|
||||
multi_agent_mode_hint_text,
|
||||
tool_namespace,
|
||||
hide_spawn_agent_metadata,
|
||||
|
||||
Reference in new issue
Block a user