mirror of
https://github.com/openai/codex.git
synced 2026-11-18 22:20:48 +00:00
Support model catalog Apps usage instructions (#61213)
## What changed - Add the disabled-by-default `catalog_apps_instructions` feature to use the selected model's `model_messages.apps.usage_instructions`, subject to existing Apps availability and model gates. - Preserve valid catalog text literally, allow an empty string to clear guidance, and fall back to bundled instructions for missing, whitespace-only, or oversized values. Overrides are limited to 800 UTF-8 bytes. - Reconcile guidance with the latest retained Apps fragment, emitting replacement or removal notices when needed and avoiding repeated updates across resumes. Preserve compatibility with bundled guidance and legacy checkpoints. - Recognize catalog Apps fragments as contextual developer messages in event mapping and rollout rollback. ## Testing Add resolver, world-state, client, and scenario coverage for literal text and byte limits, feature and availability gates, model switches, clearing guidance, resumes, and legacy history recovery. GitOrigin-RevId: 6240d407ada8f22fa101753ff3ddb338632ae283
This commit is contained in:
@@ -32,6 +32,7 @@ use codex_connectors::AppToolPolicyEvaluator;
|
||||
use codex_extension_api::WorldStateContributionInput;
|
||||
use codex_features::Feature;
|
||||
use codex_file_system::FileSystemSandboxContext;
|
||||
use codex_mcp::CODEX_APPS_MCP_SERVER_NAME;
|
||||
use codex_prompts::ApprovalPromptContext;
|
||||
use codex_prompts::ResolvedModelMessages;
|
||||
use codex_prompts::render_model_instructions;
|
||||
@@ -372,8 +373,18 @@ impl Session {
|
||||
};
|
||||
let apps_usage_instructions_available =
|
||||
apps_available && model_info.include_apps_usage_instructions;
|
||||
let apps_messages = if turn_context
|
||||
.config
|
||||
.features
|
||||
.enabled(Feature::CatalogAppsInstructions)
|
||||
{
|
||||
model_messages
|
||||
} else {
|
||||
ResolvedModelMessages::bundled()
|
||||
};
|
||||
world_state.add_section(AppsInstructionsState::new(
|
||||
apps_usage_instructions_available,
|
||||
apps_messages.apps_usage_instructions(CODEX_APPS_MCP_SERVER_NAME),
|
||||
));
|
||||
let plugins_usage_instructions_available =
|
||||
step_context.mcp.plugins_available() && model_info.include_plugin_usage_instructions;
|
||||
|
||||
Reference in New Issue
Block a user