mirror of
https://github.com/openai/codex.git
synced 2026-10-26 07:58:43 +00:00
Dylan Hurd
358575465c
## 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`
82 lines
4.0 KiB
Rust
82 lines
4.0 KiB
Rust
//! Context fragments injected into model input.
|
|
|
|
mod approved_command_prefix_saved;
|
|
mod apps_instructions;
|
|
mod available_plugins_instructions;
|
|
mod available_skills_instructions;
|
|
mod collaboration_mode_instructions;
|
|
mod contextual_user_message;
|
|
mod current_time_reminder;
|
|
mod environment_context;
|
|
mod guardian_followup_review_reminder;
|
|
mod hook_additional_context;
|
|
mod image_generation_instructions;
|
|
mod inter_agent_completion_message;
|
|
mod internal_model_context;
|
|
mod legacy_apply_patch_exec_command_warning;
|
|
mod legacy_model_mismatch_warning;
|
|
mod legacy_unified_exec_process_limit_warning;
|
|
mod model_switch_instructions;
|
|
mod multi_agent_mode_instructions;
|
|
mod network_rule_saved;
|
|
mod permissions_instructions;
|
|
mod personality_spec_instructions;
|
|
mod plugin_instructions;
|
|
mod realtime_end_instructions;
|
|
mod realtime_start_instructions;
|
|
mod realtime_start_with_instructions;
|
|
mod recommended_plugins_instructions;
|
|
mod rollout_budget;
|
|
mod subagent_notification;
|
|
mod token_budget_context;
|
|
mod turn_aborted;
|
|
mod user_instructions;
|
|
mod user_shell_command;
|
|
pub(crate) mod world_state;
|
|
|
|
pub(crate) use approved_command_prefix_saved::ApprovedCommandPrefixSaved;
|
|
pub(crate) use apps_instructions::AppsInstructions;
|
|
pub(crate) use available_plugins_instructions::AvailablePluginsInstructions;
|
|
pub use available_skills_instructions::AvailableSkillsInstructions;
|
|
pub(crate) use codex_context_fragments::AdditionalContextDeveloperFragment;
|
|
pub(crate) use codex_context_fragments::AdditionalContextUserFragment;
|
|
pub use codex_context_fragments::ContextualUserFragment;
|
|
pub(crate) use codex_context_fragments::FragmentRegistration;
|
|
pub(crate) use codex_context_fragments::FragmentRegistrationProxy;
|
|
pub(crate) use codex_core_skills::SkillInstructions;
|
|
pub(crate) use collaboration_mode_instructions::CollaborationModeInstructions;
|
|
pub(crate) use contextual_user_message::is_contextual_user_fragment;
|
|
pub(crate) use contextual_user_message::parse_visible_hook_prompt_message;
|
|
pub(crate) use current_time_reminder::CurrentTimeReminder;
|
|
pub(crate) use guardian_followup_review_reminder::GuardianFollowupReviewReminder;
|
|
pub(crate) use hook_additional_context::HookAdditionalContext;
|
|
pub(crate) use image_generation_instructions::ImageGenerationInstructions;
|
|
pub use image_generation_instructions::extension_image_generation_output_hint;
|
|
pub(crate) use inter_agent_completion_message::InterAgentCompletionMessage;
|
|
pub use internal_model_context::InternalContextSource;
|
|
pub use internal_model_context::InternalModelContextFragment;
|
|
pub use internal_model_context::InvalidInternalContextSource;
|
|
pub(crate) use legacy_apply_patch_exec_command_warning::LegacyApplyPatchExecCommandWarning;
|
|
pub(crate) use legacy_model_mismatch_warning::LegacyModelMismatchWarning;
|
|
pub(crate) use legacy_unified_exec_process_limit_warning::LegacyUnifiedExecProcessLimitWarning;
|
|
pub(crate) use model_switch_instructions::ModelSwitchInstructions;
|
|
pub(crate) use multi_agent_mode_instructions::MultiAgentModeInstructions;
|
|
pub(crate) use network_rule_saved::NetworkRuleSaved;
|
|
pub use permissions_instructions::ApprovalPromptContext;
|
|
pub use permissions_instructions::PermissionsInstructions;
|
|
pub(crate) use personality_spec_instructions::PersonalitySpecInstructions;
|
|
pub(crate) use plugin_instructions::PluginInstructions;
|
|
pub(crate) use realtime_end_instructions::RealtimeEndInstructions;
|
|
pub(crate) use realtime_start_instructions::RealtimeStartInstructions;
|
|
pub(crate) use realtime_start_with_instructions::RealtimeStartWithInstructions;
|
|
pub(crate) use recommended_plugins_instructions::RecommendedPluginsInstructions;
|
|
pub(crate) use rollout_budget::RolloutBudgetContext;
|
|
pub(crate) use subagent_notification::SubagentNotification;
|
|
pub(crate) use token_budget_context::ContextWindowGuidance;
|
|
pub(crate) use token_budget_context::TokenBudgetContext;
|
|
pub(crate) use token_budget_context::TokenBudgetRemainingContext;
|
|
pub(crate) use token_budget_context::TokenBudgetReminder;
|
|
pub(crate) use turn_aborted::TurnAborted;
|
|
pub(crate) use user_instructions::UserInstructions;
|
|
pub(crate) use user_shell_command::UserShellCommand;
|