staff-only: default assistant1::ToggleFocus to opening assistant2

crates/assistant/src/assistant.rs

@@ -22,11 +22,12 @@ use client::{proto, Client};
 use command_palette_hooks::CommandPaletteFilter;
 use feature_flags::FeatureFlagAppExt;
 use fs::Fs;
-use gpui::impl_internal_actions;
 use gpui::{actions, AppContext, Global, SharedString, UpdateGlobal};
+use gpui::{impl_actions, impl_internal_actions};
 use language_model::{
     LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
 };
+use schemars::JsonSchema;
 use semantic_index::{CloudEmbeddingProvider, SemanticDb};
 use serde::{Deserialize, Serialize};
 use settings::{Settings, SettingsStore};
@@ -49,7 +50,6 @@ actions!(
         CycleMessageRole,
         QuoteSelection,
         InsertIntoEditor,
-        ToggleFocus,
         InsertActivePrompt,
         DeployHistory,
         DeployPromptLibrary,
@@ -61,6 +61,23 @@ actions!(
     ]
 );
 
+#[derive(Clone, Debug, Eq, PartialEq, Deserialize, JsonSchema)]
+pub struct ToggleFocus {
+    /// Only relevant for Zed staff - overrides staff-only default of opening assistant2.
+    #[serde(default)]
+    pub __use_assistant1: bool,
+}
+
+impl Default for ToggleFocus {
+    fn default() -> Self {
+        ToggleFocus {
+            __use_assistant1: true,
+        }
+    }
+}
+
+impl_actions!(assistant, [ToggleFocus]);
+
 #[derive(PartialEq, Clone)]
 pub enum InsertDraggedFiles {
     ProjectPaths(Vec<PathBuf>),

crates/assistant/src/assistant_panel.rs

@@ -31,6 +31,7 @@ use editor::{
     ToOffset as _, ToPoint,
 };
 use editor::{display_map::CreaseId, FoldPlaceholder};
+use feature_flags::{Assistant2FeatureFlag, FeatureFlagAppExt};
 use fs::Fs;
 use futures::FutureExt;
 use gpui::{
@@ -96,7 +97,15 @@ pub fn init(cx: &mut AppContext) {
     cx.observe_new_views(
         |workspace: &mut Workspace, _cx: &mut ViewContext<Workspace>| {
             workspace
-                .register_action(|workspace, _: &ToggleFocus, cx| {
+                .register_action(|workspace, ToggleFocus { __use_assistant1 }, cx| {
+                    if !__use_assistant1 && cx.is_staff() && cx.has_flag::<Assistant2FeatureFlag>()
+                    {
+                        let assistant2_toggle_focus =
+                            cx.build_action("assistant2::ToggleFocus", None).unwrap();
+                        cx.dispatch_action(assistant2_toggle_focus);
+                        return;
+                    }
+
                     let settings = AssistantSettings::get_global(cx);
                     if !settings.enabled {
                         return;
@@ -1452,7 +1461,7 @@ impl Panel for AssistantPanel {
     }
 
     fn toggle_action(&self) -> Box<dyn Action> {
-        Box::new(ToggleFocus)
+        Box::new(ToggleFocus::default())
     }
 
     fn activation_priority(&self) -> u32 {

crates/assistant/src/inline_assistant.rs

@@ -1727,7 +1727,7 @@ impl PromptEditor {
     }
 
     fn placeholder_text(codegen: &Codegen, cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
+        let context_keybinding = text_for_action(&crate::ToggleFocus::default(), cx)
             .map(|keybinding| format!(" • {keybinding} for context"))
             .unwrap_or_default();
 

crates/assistant/src/terminal_inline_assistant.rs

@@ -741,7 +741,7 @@ impl PromptEditor {
     }
 
     fn placeholder_text(cx: &WindowContext) -> String {
-        let context_keybinding = text_for_action(&crate::ToggleFocus, cx)
+        let context_keybinding = text_for_action(&crate::ToggleFocus::default(), cx)
             .map(|keybinding| format!(" • {keybinding} for context"))
             .unwrap_or_default();
 

crates/feature_flags/src/feature_flags.rs

@@ -43,10 +43,6 @@ pub struct Assistant2FeatureFlag;
 
 impl FeatureFlag for Assistant2FeatureFlag {
     const NAME: &'static str = "assistant2";
-
-    fn enabled_for_staff() -> bool {
-        false
-    }
 }
 
 pub struct ToolUseFeatureFlag;