mirror of
https://github.com/openai/codex.git
synced 2026-11-17 22:10:37 +00:00
## Why Approval guidance is currently assembled entirely by the client. Model Messages V2 needs model catalogs to provide model-specific `on_request` guidance for both user-reviewed and auto-reviewed approval flows while retaining the existing generated prompt as a compatibility fallback. ## What changed - add nullable `on_request` and `on_request_auto_review` catalog messages - select the message matching the active approvals reviewer for `on_request` policies - replace the complete legacy approval section when the selected catalog value exists, including support for an empty string that suppresses the section - retain legacy rendering when the object or selected key is absent, and for non-`on_request` policies - preserve approval messages when base-instruction or personality overrides clear instruction templates - refresh permissions instructions when the active model changes - pass catalog messages through initial and incremental permissions construction ## Relationship to reviewer persistence PR #31309 independently persists the approvals reviewer in turn context and refreshes permissions when that reviewer changes. This PR is based directly on `main` and does not duplicate that rollout migration; once both land, reviewer switches will also select and append the new catalog variant. ## Testing - `just test -p codex-protocol` - `just test -p codex-prompts` - `just test -p codex-models-manager` - `just test -p codex-core permissions_messages`
138 lines
4.2 KiB
Rust
138 lines
4.2 KiB
Rust
use super::*;
|
|
use crate::ModelsManagerConfig;
|
|
use codex_protocol::openai_models::ApprovalMessages;
|
|
use pretty_assertions::assert_eq;
|
|
|
|
#[test]
|
|
fn reasoning_summaries_override_true_enables_support() {
|
|
let model = model_info_from_slug("unknown-model");
|
|
let config = ModelsManagerConfig {
|
|
model_supports_reasoning_summaries: Some(true),
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model.clone(), &config);
|
|
let mut expected = model;
|
|
expected.supports_reasoning_summaries = true;
|
|
|
|
assert_eq!(updated, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn reasoning_summaries_override_false_does_not_disable_support() {
|
|
let mut model = model_info_from_slug("unknown-model");
|
|
model.supports_reasoning_summaries = true;
|
|
let config = ModelsManagerConfig {
|
|
model_supports_reasoning_summaries: Some(false),
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model.clone(), &config);
|
|
|
|
assert_eq!(updated, model);
|
|
}
|
|
|
|
#[test]
|
|
fn reasoning_summaries_override_false_is_noop_when_model_is_false() {
|
|
let model = model_info_from_slug("unknown-model");
|
|
let config = ModelsManagerConfig {
|
|
model_supports_reasoning_summaries: Some(false),
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model.clone(), &config);
|
|
|
|
assert_eq!(updated, model);
|
|
}
|
|
|
|
#[test]
|
|
fn base_instruction_override_preserves_catalog_approval_messages() {
|
|
let mut model = model_info_from_slug("unknown-model");
|
|
let approvals = ApprovalMessages {
|
|
on_request: Some("user approvals".to_string()),
|
|
on_request_auto_review: Some("auto approvals".to_string()),
|
|
};
|
|
model.model_messages = Some(ModelMessages {
|
|
instructions_template: Some("template".to_string()),
|
|
instructions_variables: Some(ModelInstructionsVariables {
|
|
personality_default: Some("default".to_string()),
|
|
personality_friendly: Some("friendly".to_string()),
|
|
personality_pragmatic: Some("pragmatic".to_string()),
|
|
}),
|
|
approvals: Some(approvals.clone()),
|
|
});
|
|
let config = ModelsManagerConfig {
|
|
base_instructions: Some("override".to_string()),
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model, &config);
|
|
|
|
assert_eq!(
|
|
updated.model_messages,
|
|
Some(ModelMessages {
|
|
instructions_template: None,
|
|
instructions_variables: None,
|
|
approvals: Some(approvals),
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn disabled_personality_preserves_catalog_approval_messages() {
|
|
let mut model = model_info_from_slug("unknown-model");
|
|
let approvals = ApprovalMessages {
|
|
on_request: Some("user approvals".to_string()),
|
|
on_request_auto_review: None,
|
|
};
|
|
model.model_messages = Some(ModelMessages {
|
|
instructions_template: Some("template".to_string()),
|
|
instructions_variables: None,
|
|
approvals: Some(approvals.clone()),
|
|
});
|
|
let config = ModelsManagerConfig {
|
|
personality_enabled: false,
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model, &config);
|
|
|
|
assert_eq!(
|
|
updated.model_messages,
|
|
Some(ModelMessages {
|
|
instructions_template: None,
|
|
instructions_variables: None,
|
|
approvals: Some(approvals),
|
|
})
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn model_context_window_override_clamps_to_max_context_window() {
|
|
let mut model = model_info_from_slug("unknown-model");
|
|
model.context_window = Some(273_000);
|
|
model.max_context_window = Some(400_000);
|
|
let config = ModelsManagerConfig {
|
|
model_context_window: Some(500_000),
|
|
..Default::default()
|
|
};
|
|
|
|
let updated = with_config_overrides(model.clone(), &config);
|
|
let mut expected = model;
|
|
expected.context_window = Some(400_000);
|
|
|
|
assert_eq!(updated, expected);
|
|
}
|
|
|
|
#[test]
|
|
fn model_context_window_uses_model_value_without_override() {
|
|
let mut model = model_info_from_slug("unknown-model");
|
|
model.context_window = Some(273_000);
|
|
model.max_context_window = Some(400_000);
|
|
let config = ModelsManagerConfig::default();
|
|
|
|
let updated = with_config_overrides(model.clone(), &config);
|
|
|
|
assert_eq!(updated, model);
|
|
}
|