Skip to content

Add config toggles for orchestrator skills and MCP#28942

Merged
jif-oai merged 2 commits into
mainfrom
jif/disable-orchestrator-skills
Jun 19, 2026
Merged

Add config toggles for orchestrator skills and MCP#28942
jif-oai merged 2 commits into
mainfrom
jif/disable-orchestrator-skills

Conversation

@jif-oai

@jif-oai jif-oai commented Jun 18, 2026

Copy link
Copy Markdown
Collaborator

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.

@jif-oai jif-oai requested a review from a team as a code owner June 18, 2026 17:25

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1982f10023

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread codex-rs/core/src/session/config_lock.rs
Comment thread codex-rs/core/src/mcp_tool_exposure.rs Outdated
Comment thread codex-rs/core/src/config/mod.rs
@jif-oai jif-oai changed the title add config to disable orchestrator stuff Add config toggles for orchestrator skills and MCP Jun 18, 2026
@jif-oai

jif-oai commented Jun 19, 2026

Copy link
Copy Markdown
Collaborator Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 34d0d4908d

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread codex-rs/core/src/session/config_lock.rs
Comment thread codex-rs/core/src/session/turn_context.rs
Comment thread codex-rs/core/tests/suite/client.rs
@jif-oai jif-oai merged commit 81b0004 into main Jun 19, 2026
29 of 31 checks passed
@jif-oai jif-oai deleted the jif/disable-orchestrator-skills branch June 19, 2026 12:42
@github-actions github-actions Bot locked and limited conversation to collaborators Jun 19, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant