From 91eab64376b7ee62d21377714fe4252c1021262b Mon Sep 17 00:00:00 2001
From: Oz Agent <oz-agent@warp.dev>
Date: Sun, 2 Aug 2026 15:56:52 +0000
Subject: [PATCH] Clean up FallbackModelLoadOutputMessaging feature flag

---
 app/Cargo.toml                           | 2 --
 app/src/ai/blocklist/block/status_bar.rs | 3 ---
 app/src/features.rs                      | 2 --
 crates/warp_features/src/lib.rs          | 2 --
 4 files changed, 9 deletions(-)

diff --git a/app/Cargo.toml b/app/Cargo.toml
index 7eba7eb7daf..72b3adda52c 100644
--- a/app/Cargo.toml
+++ b/app/Cargo.toml
@@ -579,7 +579,6 @@ default = [
     "allow_ignoring_input_suggestions",
     "mcp_oauth",
     "expand_edit_to_pane",
-    "fallback_model_load_output_messaging",
     "api_key_management",
     "summarization_cancellation_confirmation",
     "ui_zoom",
@@ -922,7 +921,6 @@ ai_context_menu_commands = []
 preview_channel = []
 ai_context_menu_code = []
 expand_edit_to_pane = []
-fallback_model_load_output_messaging = []
 profiles_design_revamp = []
 search_codebase_ui = []
 linked_code_blocks = []
diff --git a/app/src/ai/blocklist/block/status_bar.rs b/app/src/ai/blocklist/block/status_bar.rs
index e812389c2e8..8ddbd147fe1 100644
--- a/app/src/ai/blocklist/block/status_bar.rs
+++ b/app/src/ai/blocklist/block/status_bar.rs
@@ -1130,9 +1130,6 @@ fn resolve_fallback_warping_message<V: View>(
     model: &dyn AIBlockModel<View = V>,
     app: &AppContext,
 ) -> Option<String> {
-    if !FeatureFlag::FallbackModelLoadOutputMessaging.is_enabled() {
-        return None;
-    }
     let mut is_fallback = current_is_fallback;
     let mut display_name = current_display_name;
     let is_new_user_query = model
diff --git a/app/src/features.rs b/app/src/features.rs
index 7e426e87c3b..bf507bf7da9 100644
--- a/app/src/features.rs
+++ b/app/src/features.rs
@@ -221,8 +221,6 @@ fn enabled_features() -> HashSet<FeatureFlag> {
         FeatureFlag::AIContextMenuCode,
         #[cfg(feature = "expand_edit_to_pane")]
         FeatureFlag::ExpandEditToPane,
-        #[cfg(feature = "fallback_model_load_output_messaging")]
-        FeatureFlag::FallbackModelLoadOutputMessaging,
         #[cfg(feature = "tab_close_button_on_left")]
         FeatureFlag::TabCloseButtonOnLeft,
         #[cfg(feature = "profiles_design_revamp")]
diff --git a/crates/warp_features/src/lib.rs b/crates/warp_features/src/lib.rs
index ceba8695417..f1bddbe6d01 100644
--- a/crates/warp_features/src/lib.rs
+++ b/crates/warp_features/src/lib.rs
@@ -342,8 +342,6 @@ pub enum FeatureFlag {
 
     /// Expands code diff edits to replace the current pane instead of opening in a new tab.
     ExpandEditToPane,
-    /// Enables fallback model load output messaging in the warping indicator.
-    FallbackModelLoadOutputMessaging,
 
     /// Enables close button on left side of tabs
     TabCloseButtonOnLeft,