openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-28 18:58:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow model catalogs to customize approval instruction headings (#57581)

Browse Source 
## What changed

Add optional `request_permissions` and `auto_review_suffix` fields to catalog approval messages. Use them to customize the permission tool heading and introduce automatic review guidance while preserving the bundled instruction bodies and existing policy gates. Accept `request_permissions_tool` as a deserialization alias.

Limit headings to 500 UTF-8 bytes on a single line and fall back to bundled text for missing or invalid values. Complete catalog approval messages retain precedence.

## Testing

Add coverage for heading validation, serialization aliases, policy gates, fallback behavior, and complete-message precedence. Integration tests verify that model switches append the selected model's headings without rewriting history or repeating unchanged instructions.

GitOrigin-RevId: 3311591a464cc086783fe25271a352dd5a229790
This commit is contained in:
goodman-oai
2026-10-27 22:26:12 +00:00
committed by copyberry
parent e343a12d5c
commit 133c11db43
17 changed files with 658 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/protocol/src/openai_models.rs
+42 -2
View File
@@ -769,12 +769,22 @@ pub struct ModelTokenBudgetConfig {
pub auto_compact_fallback_buffer_tokens: i64,
}
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, TS, JsonSchema)]
#[derive(Debug, Default, Serialize, Deserialize, Clone, PartialEq, Eq, TS, JsonSchema)]
pub struct ApprovalMessages {
pub on_request: Option<String>,
pub on_request_auto_review: Option<String>,
pub never: Option<String>,
pub unless_trusted: Option<String>,
/// Optional replacement heading for the request_permissions tool instructions.
#[serde(
default,
alias = "request_permissions_tool",
skip_serializing_if = "Option::is_none"
)]
pub request_permissions: Option<String>,
/// Optional introduction to the harness-owned automatic escalation review policy.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub auto_review_suffix: Option<String>,
/// Optional catalog templates for harness-owned granular approval facts.
#[serde(default, skip_serializing_if = "Option::is_none")]
pub granular: Option<GranularApprovalMessages>,
@@ -1285,7 +1295,9 @@ mod tests {
"instructions_template": null,
"approvals": {
"on_request": "",
"never": ""
"never": "",
"request_permissions": "",
"auto_review_suffix": null
}
}"#,
)
@@ -1295,13 +1307,40 @@ mod tests {
messages.approvals,
Some(ApprovalMessages {
on_request: Some(String::new()),
request_permissions: Some(String::new()),
on_request_auto_review: None,
never: Some(String::new()),
unless_trusted: None,
granular: None,
..Default::default()
})
);
for field in ["request_permissions", "request_permissions_tool"] {
for heading in [
serde_json::Value::Null,
serde_json::json!(""),
serde_json::json!("Permission requests"),
] {
let approvals: ApprovalMessages =
serde_json::from_value(serde_json::json!({ field: heading }))
.expect("permission heading should deserialize with either field name");
let mut expected = serde_json::json!({
"on_request": null,
"on_request_auto_review": null,
"never": null,
"unless_trusted": null,
});
if !heading.is_null() {
expected["request_permissions"] = heading;
}
assert_eq!(
serde_json::to_value(approvals).expect("serialize approvals"),
expected
);
}
}
for (granular, expected) in [
(serde_json::json!(null), None),
(serde_json::json!({}), Some(serde_json::json!({}))),
@@ -1674,6 +1713,7 @@ mod tests {
prompted_categories: Some("Allowed: {{ categories }}".to_string()),
rejected_categories: Some("Denied: {{ categories }}".to_string()),
}),
..Default::default()
}),
collaboration_modes: Some(CollaborationModeMessages {
default: Some("default collaboration".to_string()),