From dcd139b7c401320db61b3340cc96856f9fd3b4d7 Mon Sep 17 00:00:00 2001
From: Matthew Zeng <mzeng@openai.com>
Date: Mon, 27 Apr 2026 16:28:49 -0700
Subject: [PATCH] Add MCP app feature flag (#19884)

## Summary
- Add the `enable_mcp_apps` feature flag to the `codex-features`
registry
- Keep it under development and disabled by default

## Testing
- Unit tests for `codex-features` passed
- Formatting passed
---
 codex-rs/core/config.schema.json | 6 ++++++
 codex-rs/features/src/lib.rs     | 8 ++++++++
 2 files changed, 14 insertions(+)

diff --git a/codex-rs/core/config.schema.json b/codex-rs/core/config.schema.json
index 81d39eeef..788ff5f95 100644
--- a/codex-rs/core/config.schema.json
+++ b/codex-rs/core/config.schema.json
@@ -400,6 +400,9 @@
             "enable_fanout": {
               "type": "boolean"
             },
+            "enable_mcp_apps": {
+              "type": "boolean"
+            },
             "enable_request_compression": {
               "type": "boolean"
             },
@@ -2607,6 +2610,9 @@
         "enable_fanout": {
           "type": "boolean"
         },
+        "enable_mcp_apps": {
+          "type": "boolean"
+        },
         "enable_request_compression": {
           "type": "boolean"
         },
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index 4a4b12be3..0550201db 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -146,6 +146,8 @@ pub enum Feature {
     SpawnCsv,
     /// Enable apps.
     Apps,
+    /// Enable MCP apps.
+    EnableMcpApps,
     /// Enable the tool_search tool for apps.
     ToolSearch,
     /// Always defer MCP tools behind tool_search instead of exposing small sets directly.
@@ -834,6 +836,12 @@ pub const FEATURES: &[FeatureSpec] = &[
         stage: Stage::Stable,
         default_enabled: true,
     },
+    FeatureSpec {
+        id: Feature::EnableMcpApps,
+        key: "enable_mcp_apps",
+        stage: Stage::UnderDevelopment,
+        default_enabled: false,
+    },
     FeatureSpec {
         id: Feature::ToolSearch,
         key: "tool_search",