feat(core): allow guardian prompt overrides from model metadata

Co-authored-by: Codex <noreply@openai.com>
This commit is contained in:
Charles Cunningham
2026-03-07 16:43:46 -08:00
co-authored by Codex
parent e8d7ede83c
commit c5fdd79a42
12 changed files with 53 additions and 5 deletions
+14 -3
View File
@@ -538,11 +538,19 @@ async fn run_guardian_subagent(
};
(turn.model_info.slug.clone(), reasoning_effort)
};
let guardian_model_info = session
.services
.models_manager
.get_model_info(&guardian_model, turn.config.as_ref())
.await;
let guardian_config = build_guardian_subagent_config(
turn.config.as_ref(),
live_network_config,
guardian_model.as_str(),
guardian_reasoning_effort,
guardian_model_info
.guardian_developer_instructions
.as_deref(),
)?;
// Reuse the standard interactive subagent runner so we can seed inherited
@@ -608,11 +616,12 @@ fn build_guardian_subagent_config(
live_network_config: Option<codex_network_proxy::NetworkProxyConfig>,
active_model: &str,
reasoning_effort: Option<codex_protocol::openai_models::ReasoningEffort>,
guardian_prompt_override: Option<&str>,
) -> anyhow::Result<Config> {
let mut guardian_config = parent_config.clone();
guardian_config.model = Some(active_model.to_string());
guardian_config.model_reasoning_effort = reasoning_effort;
guardian_config.developer_instructions = Some(guardian_policy_prompt());
guardian_config.developer_instructions = Some(guardian_policy_prompt(guardian_prompt_override));
guardian_config.permissions.approval_policy = Constrained::allow_only(AskForApproval::Never);
guardian_config.permissions.sandbox_policy =
Constrained::allow_only(SandboxPolicy::new_read_only_policy());
@@ -818,8 +827,10 @@ fn guardian_output_contract_prompt() -> &'static str {
/// Keep the prompt in a dedicated markdown file so reviewers can audit prompt
/// changes directly without diffing through code. The output contract is
/// appended from code so it stays near `guardian_output_schema()`.
fn guardian_policy_prompt() -> String {
let prompt = include_str!("guardian_prompt.md").trim_end();
fn guardian_policy_prompt(prompt_override: Option<&str>) -> String {
let prompt = prompt_override
.unwrap_or(include_str!("guardian_prompt.md"))
.trim_end();
format!("{prompt}\n\n{}\n", guardian_output_contract_prompt())
}
+23 -2
View File
@@ -232,6 +232,7 @@ fn guardian_subagent_config_preserves_parent_network_proxy() {
None,
"parent-active-model",
Some(codex_protocol::openai_models::ReasoningEffort::Low),
None,
)
.expect("guardian config");
@@ -278,6 +279,7 @@ fn guardian_subagent_config_uses_live_network_proxy_state() {
Some(live_network.clone()),
"active-model",
None,
None,
)
.expect("guardian config");
@@ -308,7 +310,7 @@ fn guardian_subagent_config_rejects_pinned_collab_feature() {
)
.expect("managed features");
let err = build_guardian_subagent_config(&parent_config, None, "active-model", None)
let err = build_guardian_subagent_config(&parent_config, None, "active-model", None, None)
.expect_err("guardian config should fail when collab is pinned on");
assert!(
@@ -323,8 +325,27 @@ fn guardian_subagent_config_uses_parent_active_model_instead_of_hardcoded_slug()
parent_config.model = Some("configured-model".to_string());
let guardian_config =
build_guardian_subagent_config(&parent_config, None, "active-model", None)
build_guardian_subagent_config(&parent_config, None, "active-model", None, None)
.expect("guardian config");
assert_eq!(guardian_config.model, Some("active-model".to_string()));
}
#[test]
fn guardian_subagent_config_prefers_model_prompt_override() {
let guardian_config = build_guardian_subagent_config(
&test_config(),
None,
"active-model",
None,
Some("override prompt"),
)
.expect("guardian config");
let instructions = guardian_config
.developer_instructions
.expect("guardian instructions");
assert!(instructions.starts_with("override prompt"));
assert!(instructions.contains("\"risk_level\": \"low\" | \"medium\" | \"high\""));
}
@@ -73,6 +73,7 @@ pub(crate) fn model_info_from_slug(slug: &str) -> ModelInfo {
availability_nux: None,
upgrade: None,
base_instructions: BASE_INSTRUCTIONS.to_string(),
guardian_developer_instructions: None,
model_messages: local_personality_messages_for_slug(slug),
supports_reasoning_summaries: false,
default_reasoning_summary: ReasoningSummary::Auto,