From 0bff38c54a89f4658cfe79466e8a17a469f9e201 Mon Sep 17 00:00:00 2001
From: Matthew Zeng <mzeng@openai.com>
Date: Tue, 24 Mar 2026 20:31:21 -0700
Subject: [PATCH] [plugins] Flip the flags. (#15713)

- [x] Flip the `plugins` and `apps` flags.
---
 codex-rs/core/src/plugins/discoverable_tests.rs |  6 ++++++
 codex-rs/core/src/tools/spec_tests.rs           |  8 +++-----
 codex-rs/features/src/lib.rs                    | 12 ++++--------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/codex-rs/core/src/plugins/discoverable_tests.rs b/codex-rs/core/src/plugins/discoverable_tests.rs
index cb2ac1549..fd9df9ddf 100644
--- a/codex-rs/core/src/plugins/discoverable_tests.rs
+++ b/codex-rs/core/src/plugins/discoverable_tests.rs
@@ -44,6 +44,12 @@ async fn list_tool_suggest_discoverable_plugins_returns_empty_when_plugins_featu
     let codex_home = tempdir().expect("tempdir should succeed");
     let curated_root = crate::plugins::curated_plugins_repo_path(codex_home.path());
     write_openai_curated_marketplace(&curated_root, &["slack"]);
+    write_file(
+        &codex_home.path().join(crate::config::CONFIG_TOML_FILE),
+        r#"[features]
+plugins = false
+"#,
+    );
 
     let config = load_plugins_config(codex_home.path()).await;
     let discoverable_plugins = list_tool_suggest_discoverable_plugins(&config)
diff --git a/codex-rs/core/src/tools/spec_tests.rs b/codex-rs/core/src/tools/spec_tests.rs
index dd806f887..b5f50ae6f 100644
--- a/codex-rs/core/src/tools/spec_tests.rs
+++ b/codex-rs/core/src/tools/spec_tests.rs
@@ -2075,11 +2075,9 @@ fn tool_suggest_requires_apps_and_plugins_features() {
     for disabled_feature in [Feature::Apps, Feature::Plugins] {
         let mut features = Features::with_defaults();
         features.enable(Feature::ToolSuggest);
-        for feature in [Feature::Apps, Feature::Plugins] {
-            if feature != disabled_feature {
-                features.enable(feature);
-            }
-        }
+        features.enable(Feature::Apps);
+        features.enable(Feature::Plugins);
+        features.disable(disabled_feature);
 
         let tools_config = ToolsConfig::new(&ToolsConfigParams {
             model_info: &model_info,
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index f49428cec..6128fe43f 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -714,12 +714,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::Apps,
         key: "apps",
-        stage: Stage::Experimental {
-            name: "Apps",
-            menu_description: "Use a connected ChatGPT App using \"$\". Install Apps via /apps command. Restart Codex after enabling.",
-            announcement: "NEW: Use ChatGPT Apps (Connectors) in Codex via $ mentions. Enable in /experimental and restart Codex!",
-        },
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::ToolSuggest,
@@ -730,8 +726,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::Plugins,
         key: "plugins",
-        stage: Stage::UnderDevelopment,
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::ImageGeneration,