Rebasing, going about this another way

app/src/workspace/action.rs

@@ -541,7 +541,7 @@ pub enum WorkspaceAction {
     ResetBuildPlanMigrationModalState,
     /// Reset the AWS Bedrock login banner dismissed state (for debugging).
     #[cfg(debug_assertions)]
-    DebugResetAwsBedrockLoginBannerDismissed,
+    DebugResetBedrockLoginBannerDismissed,
     /// Open the Oz Launch Modal (for debugging)
     #[cfg(debug_assertions)]
     OpenOzLaunchModal,
@@ -941,7 +941,7 @@ impl WorkspaceAction {
             #[cfg(debug_assertions)]
             OpenBuildPlanMigrationModal
             | ResetBuildPlanMigrationModalState
-            | DebugResetAwsBedrockLoginBannerDismissed
+            | DebugResetBedrockLoginBannerDismissed
             | OpenOzLaunchModal
             | ResetOzLaunchModalState
             | OpenOpenWarpLaunchModal

app/src/workspace/mod.rs

@@ -198,9 +198,9 @@ pub fn init(app: &mut AppContext) {
                 )
                 .with_context_predicate(id!("Workspace")),
                 EditableBinding::new(
-                    "workspace:debug_reset_aws_bedrock_login_banner_dismissed",
+                    "workspace:debug_reset_bedrock_login_banner_dismissed",
                     "[Debug] Un-dismiss AWS login banner",
-                    WorkspaceAction::DebugResetAwsBedrockLoginBannerDismissed,
+                    WorkspaceAction::DebugResetBedrockLoginBannerDismissed,
                 )
                 .with_context_predicate(id!("Workspace")),
                 EditableBinding::new(

app/src/workspace/view.rs

@@ -21233,11 +21233,11 @@ impl TypedActionView for Workspace {
                 log::info!("Build plan migration modal dismissed state has been reset");
             }
             #[cfg(debug_assertions)]
-            DebugResetAwsBedrockLoginBannerDismissed => {
+            DebugResetBedrockLoginBannerDismissed => {
                 // Reset the AWS Bedrock login banner dismissed state for debugging
                 AISettings::handle(ctx).update(ctx, |ai_settings, ctx| {
                     if let Err(e) = ai_settings
-                        .aws_bedrock_login_banner_dismissed
+                        .bedrock_login_banner_dismissed
                         .set_value(false, ctx)
                     {
                         log::warn!(