mirror of
https://github.com/openai/codex.git
synced 2026-08-23 13:09:46 +00:00
Use model-specific auto-review outcome instructions (#39741)
## What changed - Add `rejection_instructions` and `timeout_instructions` to catalog-provided auto-review messages. - Use the acting model's instructions for denied and timed-out reviews across tool approvals, shell escalation, and MCP elicitation responses. - Fall back to the existing instructions only when a catalog value is absent, while preserving explicit empty-string overrides. ## Testing - Cover catalog overrides, legacy fallbacks, empty values, and separation between acting-model and reviewer-model messages. GitOrigin-RevId: c5b2c2dbdaefd45d1d658651dd1abaeb6d8c93da
This commit is contained in:
@@ -572,6 +572,8 @@ pub struct CollaborationModeMessages {
|
||||
pub struct AutoReviewMessages {
|
||||
pub policy: Option<String>,
|
||||
pub policy_template: Option<String>,
|
||||
pub rejection_instructions: Option<String>,
|
||||
pub timeout_instructions: Option<String>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq, TS, JsonSchema)]
|
||||
@@ -987,7 +989,7 @@ mod tests {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn auto_review_messages_preserve_missing_and_empty_template_values() {
|
||||
fn auto_review_messages_preserve_missing_and_empty_values() {
|
||||
let missing_template: ModelMessages = from_str(
|
||||
r#"{
|
||||
"instructions_template": null,
|
||||
@@ -1004,7 +1006,9 @@ mod tests {
|
||||
"instructions_variables": null,
|
||||
"auto_review": {
|
||||
"policy": "policy",
|
||||
"policy_template": ""
|
||||
"policy_template": "",
|
||||
"rejection_instructions": "",
|
||||
"timeout_instructions": ""
|
||||
}
|
||||
}"#,
|
||||
)
|
||||
@@ -1015,6 +1019,8 @@ mod tests {
|
||||
Some(AutoReviewMessages {
|
||||
policy: Some("policy".to_string()),
|
||||
policy_template: None,
|
||||
rejection_instructions: None,
|
||||
timeout_instructions: None,
|
||||
})
|
||||
);
|
||||
assert_eq!(
|
||||
@@ -1022,6 +1028,8 @@ mod tests {
|
||||
Some(AutoReviewMessages {
|
||||
policy: Some("policy".to_string()),
|
||||
policy_template: Some(String::new()),
|
||||
rejection_instructions: Some(String::new()),
|
||||
timeout_instructions: Some(String::new()),
|
||||
})
|
||||
);
|
||||
}
|
||||
@@ -1385,6 +1393,8 @@ mod tests {
|
||||
auto_review: Some(AutoReviewMessages {
|
||||
policy: Some("policy".to_string()),
|
||||
policy_template: None,
|
||||
rejection_instructions: Some("rejection instructions".to_string()),
|
||||
timeout_instructions: Some("timeout instructions".to_string()),
|
||||
}),
|
||||
permissions: Some(PermissionMessages {
|
||||
danger_full_access: None,
|
||||
|
||||
Reference in New Issue
Block a user