mirror of
https://github.com/openai/codex.git
synced 2026-11-22 07:13:50 +00:00
Add config toggles for orchestrator skills and MCP (#28942)
## Why Orchestrator-provided skills and Codex Apps MCP tools add model-visible instructions, resources, and tools beyond the local workspace. Hosts need config-level switches to disable those orchestrator-owned surfaces independently, without disabling regular skills or regular MCP servers. ## What changed - Adds `[orchestrator.skills].enabled` and `[orchestrator.mcp].enabled` config entries, both defaulting to `true`. - Includes the new settings in `config.schema.json` and in the config lock so resolved thread configuration preserves the same orchestrator exposure decisions. - Threads `orchestrator.skills.enabled` through the app-server skills extension so disabled orchestrator skills do not expose the `skills` namespace or inject orchestrator skill context. - Gates Codex Apps MCP exposure, app instructions, and app auth eligibility on `orchestrator.mcp.enabled` while leaving non-Codex-Apps MCP tools available. - Updates the thread-manager sample config to disable both orchestrator-owned surfaces. ## Verification - Added config parsing, loading, defaulting, and schema coverage for the new settings. - Added MCP exposure coverage that `orchestrator.mcp.enabled = false` removes Codex Apps tools while preserving regular MCP tools. - Added app-server coverage that `orchestrator.skills.enabled = false` prevents orchestrator skill tools, prompts, and resource reads from reaching the model turn.
This commit is contained in:
20 files changed
+405
-20
No files matched your search
@@ -1,6 +1,8 @@
|
||||
use anyhow::Context;
|
||||
use codex_config::config_toml::ConfigLockfileToml;
|
||||
use codex_config::config_toml::ConfigToml;
|
||||
use codex_config::config_toml::OrchestratorFeatureToml;
|
||||
use codex_config::config_toml::OrchestratorToml;
|
||||
use codex_config::types::MemoriesToml;
|
||||
use codex_features::CurrentTimeReminderConfigToml;
|
||||
use codex_features::Feature;
|
||||
@@ -183,6 +185,18 @@ fn save_config_resolved_fields(
|
||||
.skills
|
||||
.get_or_insert_with(Default::default)
|
||||
.include_instructions = Some(config.include_skill_instructions);
|
||||
lock_config
|
||||
.orchestrator
|
||||
.get_or_insert_with(OrchestratorToml::default)
|
||||
.skills
|
||||
.get_or_insert_with(OrchestratorFeatureToml::default)
|
||||
.enabled = Some(config.orchestrator_skills_enabled);
|
||||
lock_config
|
||||
.orchestrator
|
||||
.get_or_insert_with(OrchestratorToml::default)
|
||||
.mcp
|
||||
.get_or_insert_with(Default::default)
|
||||
.enabled = Some(config.orchestrator_mcp_enabled);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user