From 8440e76ae6d4875a6f01398e09bd27734da741e7 Mon Sep 17 00:00:00 2001
From: alexsong-oai <alexsong@openai.com>
Date: Thu, 22 Oct 2026 00:44:40 +0000
Subject: [PATCH] Enable the Bedrock setup wizard by default (#56033)

## What changed

Promote `bedrock_setup_wizard` to stable and enable it by default for eligible onboarding. Users can still disable it with `features.bedrock_setup_wizard = false`.

## Testing

Update onboarding coverage to check the enabled default and explicit opt-out. Remove the explicit opt-in from daemon startup tests so they exercise the default configuration.

GitOrigin-RevId: 5bd911088681a31d34aa444398e6d3f7d1d87955
---
 codex-rs/cli/tests/daemon_startup.rs | 2 +-
 codex-rs/features/src/lib.rs         | 4 ++--
 codex-rs/tui/src/lib.rs              | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/codex-rs/cli/tests/daemon_startup.rs b/codex-rs/cli/tests/daemon_startup.rs
index e3b1eef9fa..afe2058826 100644
--- a/codex-rs/cli/tests/daemon_startup.rs
+++ b/codex-rs/cli/tests/daemon_startup.rs
@@ -179,7 +179,7 @@ async fn daemon_startup(command: &str) -> Result<()> {
         home.path().join("config.toml"),
         format!(
             "model = \"gpt-5.6-terra\"\n\
-         features.bedrock_setup_wizard = true\ncli_auth_credentials_store = \"file\"\n\
+         cli_auth_credentials_store = \"file\"\n\
          suppress_unstable_features_warning = true\nanalytics.enabled = false\n\
          windows.sandbox = \"unelevated\"\n\
          tui.disable_paste_burst = true\n\
diff --git a/codex-rs/features/src/lib.rs b/codex-rs/features/src/lib.rs
index d0fc6e1fd8..c9d074ac3d 100644
--- a/codex-rs/features/src/lib.rs
+++ b/codex-rs/features/src/lib.rs
@@ -2017,8 +2017,8 @@ pub const FEATURES: &[FeatureSpec] = &[
     FeatureSpec {
         id: Feature::BedrockSetupWizard,
         key: "bedrock_setup_wizard",
-        stage: Stage::UnderDevelopment,
-        default_enabled: false,
+        stage: Stage::Stable,
+        default_enabled: true,
     },
     FeatureSpec {
         id: Feature::Personality,
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs
index 8b2862c76e..147ff230b0 100644
--- a/codex-rs/tui/src/lib.rs
+++ b/codex-rs/tui/src/lib.rs
@@ -2563,10 +2563,17 @@ requires_openai_auth = {requires_openai_auth}
 
         for (label, config_toml, login_status, target, expected) in [
             (
-                "disabled by default",
+                "enabled by default",
                 "",
                 LoginStatus::NotAuthenticated,
                 AppServerTarget::Embedded,
+                true,
+            ),
+            (
+                "explicitly disabled",
+                "[features]\nbedrock_setup_wizard = false\n",
+                LoginStatus::NotAuthenticated,
+                AppServerTarget::Embedded,
                 false,
             ),
             (